r15527 - gnucash/trunk/packaging/win32 - Install.sh: Move wget, unzip, indent and pexports to \tools.

[Andreas Köhler]

Author: andi5
Date: 2007-02-08 15:50:29 -0500 (Thu, 08 Feb 2007)
New Revision: 15527
Trac: http://svn.gnucash.org/trac/changeset/15527

Modified:
   gnucash/trunk/packaging/win32/custom.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Install.sh: Move wget, unzip, indent and pexports to \tools.

Unclutter c:\soft and the PATH environment variable a bit by moving some
tools to GLOBAL_DIR\tools. "Tool" here means a binary or shell script
that works without further DLLs or shared files.


Modified: gnucash/trunk/packaging/win32/custom.sh
===================================================================
--- gnucash/trunk/packaging/win32/custom.sh	2007-02-08 18:27:18 UTC (rev 15526)
+++ gnucash/trunk/packaging/win32/custom.sh	2007-02-08 20:50:29 UTC (rev 15527)
@@ -44,7 +44,8 @@
 
 MSYS_DIR=$GLOBAL_DIR\\msys
 
-WGET_DIR=$GLOBAL_DIR\\wget
+# tools here means binaries runnable without other DLLs or data files
+WGET_DIR=$GLOBAL_DIR\\tools
 #WGET=
 
 SF_MIRROR="http://heanet.dl.sourceforge.net/sourceforge"
@@ -59,7 +60,7 @@
 MINGW_DIR=$GLOBAL_DIR\\mingw
 
 UNZIP_URL="$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
-UNZIP_DIR=$GLOBAL_DIR\\unzip
+UNZIP_DIR=$GLOBAL_DIR\\tools
 
 # do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852
 REGEX_URL="$GNOME_WIN32_DEPS_URL/libgnurx-2.5.zip"
@@ -71,7 +72,7 @@
 READLINE_DIR=$GLOBAL_DIR\\readline
 
 INDENT_BIN_URL="$SF_MIRROR/gnuwin32/indent-2.2.9-bin.zip"
-INDENT_DIR=$GLOBAL_DIR\\indent
+INDENT_DIR=$GLOBAL_DIR\\tools
 
 ACTIVE_PERL_URL="http://downloads.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.638-MSWin32-x86.zip"
 ACTIVE_PERL_DIR=$GLOBAL_DIR\\active-perl
@@ -90,7 +91,7 @@
 OPENSSL_DIR=$GLOBAL_DIR\\openssl
 
 PEXPORTS_URL="http://www.emmestech.com/software/cygwin/pexports-0.43/pexports-0.43.zip"
-PEXPORTS_DIR=$GLOBAL_DIR\\pexports
+PEXPORTS_DIR=$GLOBAL_DIR\\tools
 
 LIBXML2_URL="http://www.zlatkovic.com/pub/libxml/libxml2-2.6.27.win32.zip"
 LIBXML2_DIR=$GLOBAL_DIR\\gnome #avoid XML_FLAGS

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2007-02-08 18:27:18 UTC (rev 15526)
+++ gnucash/trunk/packaging/win32/install.sh	2007-02-08 20:50:29 UTC (rev 15527)
@@ -68,15 +68,15 @@
 function inst_wget() {
     setup Wget
     _WGET_UDIR=`unix_path $WGET_DIR`
+    add_to_env $_WGET_UDIR/bin PATH
     if quiet $_WGET_UDIR/wget --version || quiet wget --version
     then
         echo "already installed.  skipping."
     else
-        mkdir -p $_WGET_UDIR
-        tar -xjpf $DOWNLOAD_UDIR/wget*.tar.bz2 -C $WGET_DIR
-        cp $_WGET_UDIR/*/*/wget.exe $WGET_DIR
+        mkdir -p $_WGET_UDIR/bin
+        tar -xjpf $DOWNLOAD_UDIR/wget*.tar.bz2 -C $_WGET_UDIR
+        cp $_WGET_UDIR/*/*/wget.exe $_WGET_UDIR/bin
     fi
-    add_to_env $_WGET_UDIR PATH
     quiet wget --version || die "wget unavailable"
 }
 
@@ -122,6 +122,7 @@
 function inst_unzip() {
     setup Unzip
     _UNZIP_UDIR=`unix_path $UNZIP_DIR`
+    add_to_env $_UNZIP_UDIR/bin PATH
     if quiet $_UNZIP_UDIR/bin/unzip --help || quiet unzip --help
     then
         echo "unzip already installed.  skipping."
@@ -130,7 +131,6 @@
         echo "!!! When asked for an installation path, specify $UNZIP_DIR !!!"
         $LAST_FILE
     fi
-    add_to_env $_UNZIP_UDIR/bin PATH
     quiet unzip --help || die "unzip unavailable"
 }
 
@@ -358,13 +358,12 @@
     else
         wget_unpacked $PEXPORTS_URL $DOWNLOAD_DIR $PEXPORTS_DIR
         qpushd $PEXPORTS_DIR
-	    mv pexports-* mydir
-	    mv mydir/* .
-	    rmdir mydir
+	    mkdir -p $_PEXPORTS_UDIR/bin
+	    cp pexports-*/bin/* $_PEXPORTS_UDIR/bin
 	    if test x$cross_compile = xyes ; then
-		cd src
+		cd pexports-*/src
 		make
-		cp pexports.exe ../bin/pexports
+		cp pexports.exe ../../bin/pexports
 	    fi
         qpopd
     fi