Author: nextgens
Date: 2008-06-04 22:00:08 +0000 (Wed, 04 Jun 2008)
New Revision: 20204
Modified:
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/setup.sh
trunk/apps/new_installer/res/windows/bin/setup.cmd
Log:
new_installer: some untested code to download the wrapper binaries from emu
later on
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-06-04 17:44:02 UTC (rev
20203)
+++ trunk/apps/new_installer/install.xml 2008-06-04 22:00:08 UTC (rev
20204)
@@ -136,6 +136,8 @@
<fileset dir="res/windows/" targetdir="$INSTALL_PATH">
<exclude name="*/**/.svn"/>
<exclude name="*/**/.svn/**"/>
+ <exclude name="bin/*.exe"/>
+ <exclude name="lib/*.dll"/>
<include name="*/**"/>
</fileset>
@@ -164,6 +166,8 @@
<fileset dir="res/unix/" targetdir="$INSTALL_PATH">
<exclude name="*/**/.svn"/>
<exclude name="*/**/.svn/**"/>
+ <exclude name="bin/wrapper-*"/>
+ <exclude name="lib/libwrapper-*"/>
<include name="*/**"/>
</fileset>
@@ -188,6 +192,8 @@
<fileset dir="res/unix/" targetdir="$INSTALL_PATH">
<exclude name="*/**/.svn"/>
<exclude name="*/**/.svn/**"/>
+ <exclude name="bin/wrapper-*"/>
+ <exclude name="lib/libwrapper-*"/>
<include name="*/**"/>
</fileset>
Modified: trunk/apps/new_installer/res/unix/bin/setup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/setup.sh 2008-06-04 17:44:02 UTC
(rev 20203)
+++ trunk/apps/new_installer/res/unix/bin/setup.sh 2008-06-04 22:00:08 UTC
(rev 20204)
@@ -1,10 +1,12 @@
#!/bin/sh
INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+CAFILE="$INSTALL_PATH/startssl.pem"
+JOPTS=" -Djava.net.preferIPv4Stack=true "
echo '#!/bin/sh' > "$HOME/_install_toSource.sh"
echo INSTALL_PATH=\"$INSTALL_PATH\" >> "$HOME/_install_toSource.sh"
-echo CAFILE=\"$INSTALL_PATH/startssl.pem\" >> "$HOME/_install_toSource.sh"
-echo JOPTS=\" -Djava.net.preferIPv4Stack=true \" >>
"$HOME/_install_toSource.sh"
+echo CAFILE=\"$CAFILE\" >> "$HOME/_install_toSource.sh"
+echo JOPTS=\"$JOPTS\" >> "$HOME/_install_toSource.sh"
echo ISO3_LANG=\"$ISO3_LANG\" >> "$HOME/_install_toSource.sh"
echo "if test -f \"$INSTALL_PATH/.isInstalled\"; then exit 1; fi" >>
"$HOME/_install_toSource.sh"
chmod 755 "$HOME/_install_toSource.sh"
@@ -22,13 +24,16 @@
# Hack to use a generic template for plugins
touch plug
-# We need the exec flag on /bin
-chmod u+x bin/*sh bin/wrapper-* lib/* >/dev/null 2>&1
-
# Are we in offline mode ?
if test -e offline
then
echo "Offline installation mode"
else
echo "Online installation mode"
+ echo "Downloading the wrapper binaries"
+ OS="`uname -s`"
+ java $JOPTS -jar bin/sha1test.jar wrapper_$OS.zip . "$CAFILE" >/dev/null
fi
+java $JOPTS -jar bin/uncompress.jar wrapper_$OS.zip . 2>&1 >/dev/null
+# We need the exec flag on /bin
+chmod u+x bin/* lib/*
Modified: trunk/apps/new_installer/res/windows/bin/setup.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/setup.cmd 2008-06-04 17:44:02 UTC
(rev 20203)
+++ trunk/apps/new_installer/res/windows/bin/setup.cmd 2008-06-04 22:00:08 UTC
(rev 20204)
@@ -26,5 +26,12 @@
@del /F fref.reg
:: Are we in offline mode ?
- at if exist offline echo "Offline installation mode"
+ at if not exist offline goto online
+ at echo "Offline installation mode"
+ at goto uncompress
+ at echo "Online installation mode"
+ at java -jar bin\sha1test.jar wrapper_windows.zip . %CAFILE% > NUL
+:uncompress
+ at java -jar bin\uncompress.jar wrapper_windows.zip . > NUL
+
:end
