From 775592791da500a3ef4a4c2cd2572f03e8dfe33c Mon Sep 17 00:00:00 2001 From: "zodiac@gmail.com" Date: Wed, 31 Mar 2010 16:07:06 +0000 Subject: [PATCH] Thanks to some more testing and additional information provided by Jan Jaeger, we now have a much cleaner solution for building ShellInABox on OpenWRT. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@204 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- ChangeLog | 5 +++++ Makefile.am | 4 ++-- Makefile.in | 4 ++-- config.h | 2 +- configure | 2 +- configure.ac | 2 +- demo/vt100.js | 2 +- shellinabox/shell_in_a_box.js | 2 +- shellinabox/vt100.js | 2 +- 9 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 339feb0..6f9168d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-03-31 Markus Gutschke + + * Tweaked the build system to work better on OpenWRT. This is largely + thanks to very helpful bug reports, and lots of testing by Jan Jaeger. + 2010-03-29 Markus Gutschke * Started working on support for WebSockets. diff --git a/Makefile.am b/Makefile.am index 1aac935..aa1affb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ AM_CFLAGS = -g -std=gnu99 -Wall AM_LDFLAGS = -g OBJCOPY ?= objcopy +OBJDUMP ?= objdump noinst_LTLIBRARIES = libhttp.la \ liblogging.la @@ -113,11 +114,10 @@ shellinaboxd_LDFLAGS = -static objcopyflags = case "$(host_cpu)" in \ i[0-9]86)echo '-O elf32-i386 -B i386';; \ x86_64) echo '-O elf64-x86-64 -B i386:x86-64';; \ - mips*) echo '-O elf32-tradlittlemips -B mips:isa32'\ *) trap 'rm -f /tmp/probe$$$$.o' EXIT; \ $(CC) $(AM_CFLAGS) $(CFLAGS) -c -xc \ -o /tmp/probe$$$$.o /dev/null && \ - objdump -f /tmp/probe$$$$.o | \ + $(OBJDUMP) -f /tmp/probe$$$$.o | \ sed -e 's/.*file format */-O /;t; \ s/architecture: *\([^,]*\).*/-B \1/;t; \ d';; \ diff --git a/Makefile.in b/Makefile.in index 6630572..9a797fd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -375,11 +375,10 @@ shellinaboxd_LDFLAGS = -static objcopyflags = case "$(host_cpu)" in \ i[0-9]86)echo '-O elf32-i386 -B i386';; \ x86_64) echo '-O elf64-x86-64 -B i386:x86-64';; \ - mips*) echo '-O elf32-tradlittlemips -B mips:isa32'\ *) trap 'rm -f /tmp/probe$$$$.o' EXIT; \ $(CC) $(AM_CFLAGS) $(CFLAGS) -c -xc \ -o /tmp/probe$$$$.o /dev/null && \ - objdump -f /tmp/probe$$$$.o | \ + $(OBJDUMP) -f /tmp/probe$$$$.o | \ sed -e 's/.*file format */-O /;t; \ s/architecture: *\([^,]*\).*/-B \1/;t; \ d';; \ @@ -1154,6 +1153,7 @@ uninstall-man: uninstall-man1 OBJCOPY ?= objcopy +OBJDUMP ?= objdump libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck diff --git a/config.h b/config.h index 0b51859..9572148 100644 --- a/config.h +++ b/config.h @@ -144,7 +144,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "202" +#define VCS_REVISION "204" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index b617819..b58739a 100755 --- a/configure +++ b/configure @@ -2325,7 +2325,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=202 +VCS_REVISION=204 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 70ffbc4..2e67ff2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.57) dnl This is the one location where the authoritative version number is stored AC_INIT(shellinabox, 2.10, markus@shellinabox.com) -VCS_REVISION=202 +VCS_REVISION=204 AC_SUBST(VCS_REVISION) AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", [Most recent revision number in the version control system]) diff --git a/demo/vt100.js b/demo/vt100.js index e6fbf79..bd09662 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 202)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 204)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index 63b079a..e404147 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.10 (revision 202)" + + alert("Shell In A Box version " + "2.10 (revision 204)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js index e6fbf79..bd09662 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 202)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 204)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); };