simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Thanks to some more testing and additional information provided by Jan Jaeger,

Browse source 
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
This commit is contained in:
zodiac@gmail.com 2010-03-31 16:07:06 +00:00
parent 2ea8e5cc77
commit 775592791d
9 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-03-31 Markus Gutschke <markus@shellinabox.com>
* 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 <markus@shellinabox.com> 2010-03-29 Markus Gutschke <markus@shellinabox.com>
* Started working on support for WebSockets. * Started working on support for WebSockets.

4
Makefile.am
View file

@ -3,6 +3,7 @@ AM_CFLAGS = -g -std=gnu99 -Wall
AM_LDFLAGS = -g AM_LDFLAGS = -g
OBJCOPY ?= objcopy OBJCOPY ?= objcopy
OBJDUMP ?= objdump
noinst_LTLIBRARIES = libhttp.la \ noinst_LTLIBRARIES = libhttp.la \
liblogging.la liblogging.la
@ -113,11 +114,10 @@ shellinaboxd_LDFLAGS = -static
objcopyflags = case "$(host_cpu)" in \ objcopyflags = case "$(host_cpu)" in \
i[0-9]86)echo '-O elf32-i386 -B i386';; \ i[0-9]86)echo '-O elf32-i386 -B i386';; \
x86_64) echo '-O elf64-x86-64 -B i386:x86-64';; \ 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; \ *) trap 'rm -f /tmp/probe$$$$.o' EXIT; \
$(CC) $(AM_CFLAGS) $(CFLAGS) -c -xc \ $(CC) $(AM_CFLAGS) $(CFLAGS) -c -xc \
-o /tmp/probe$$$$.o /dev/null && \ -o /tmp/probe$$$$.o /dev/null && \
objdump -f /tmp/probe$$$$.o | \ $(OBJDUMP) -f /tmp/probe$$$$.o | \
sed -e 's/.*file format */-O /;t; \ sed -e 's/.*file format */-O /;t; \
s/architecture: *\([^,]*\).*/-B \1/;t; \ s/architecture: *\([^,]*\).*/-B \1/;t; \
d';; \ d';; \

4
Makefile.in
View file

@ -375,11 +375,10 @@ shellinaboxd_LDFLAGS = -static
objcopyflags = case "$(host_cpu)" in \ objcopyflags = case "$(host_cpu)" in \
i[0-9]86)echo '-O elf32-i386 -B i386';; \ i[0-9]86)echo '-O elf32-i386 -B i386';; \
x86_64) echo '-O elf64-x86-64 -B i386:x86-64';; \ 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; \ *) trap 'rm -f /tmp/probe$$$$.o' EXIT; \
$(CC) $(AM_CFLAGS) $(CFLAGS) -c -xc \ $(CC) $(AM_CFLAGS) $(CFLAGS) -c -xc \
-o /tmp/probe$$$$.o /dev/null && \ -o /tmp/probe$$$$.o /dev/null && \
objdump -f /tmp/probe$$$$.o | \ $(OBJDUMP) -f /tmp/probe$$$$.o | \
sed -e 's/.*file format */-O /;t; \ sed -e 's/.*file format */-O /;t; \
s/architecture: *\([^,]*\).*/-B \1/;t; \ s/architecture: *\([^,]*\).*/-B \1/;t; \
d';; \ d';; \
@ -1154,6 +1153,7 @@ uninstall-man: uninstall-man1
OBJCOPY ?= objcopy OBJCOPY ?= objcopy
OBJDUMP ?= objdump
libtool: $(LIBTOOL_DEPS) libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck

2
config.h
View file

@ -144,7 +144,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "202" #define VCS_REVISION "204"
/* Version number of package */ /* Version number of package */
#define VERSION "2.10" #define VERSION "2.10"

2
configure vendored
View file

@ -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 ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=202 VCS_REVISION=204
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.10, markus@shellinabox.com) AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
VCS_REVISION=202 VCS_REVISION=204
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

2
demo/vt100.js
View file

@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2010 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };

2
shellinabox/shell_in_a_box.js
View file

@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { 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" + "\nCopyright 2008-2010 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" + "For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

2
shellinabox/vt100.js
View file

@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2010 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };