shithub: sox

Download patch

ref: 2c3c76cd093d2329faaf1f48b26fd992a54e6788
parent: b8850883a9e3e969e8cf2b1db7409e4b46fbb269
author: cbagwell <cbagwell>
date: Sat Apr 10 18:15:17 EDT 2010 

Create a windows installer when nsiswrapper is installed.


--- a/mingwbuild
+++ b/mingwbuild
@@ -34,7 +34,7 @@
 # version of libltdl to help compiler out (means I can use
 # a packaged version).
 # cd libtool-1.5.26
-# mingw32-configure --disable-shared --enable-static;mingw32-make;sudu mingw32-make install
+# mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
 #
 #
 # libpng.la will have libtool issue because depends on libz
@@ -41,7 +41,7 @@
 # which has a libz.la file.  Must edit libpng.la to
 # prevent needing to distribute zlib1.dll.
 # cd libpng-1.2.41
-# mingw32-configure --disable-shared --enable-static;mingw32-make;sudu mingw32-make install
+# mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
 #
 # MINGW work around: had to comment out "cli" from SUBDIR.
 # cd ../wavpack-4.60.1
@@ -64,7 +64,7 @@
 # MINGW work around: Can either add -lwsock32 to end of *_LDADD for any 
 # failed program links or modify top leve Makefile and remove
 # "programs", "examples", "regtests", and "tests" from SUBDIRS.
-# cd ../libsndfile-1.0.20
+# cd ../libsndfile-1.0.21
 # mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
 #
 # To get MP3 header files used to enable MP3 support (no libraries used):
@@ -133,19 +133,24 @@
 done
 
 binaries=src/sox.exe
+
 # If you do not edit libpng.la to comment out shared libraries
 # then you'll need to distribute zlib1.dll.
-#binaries="$binaries ${SYS_ROOT}/mingw/bin/zlib1.dll"
+dlls=""
+dlls="$dlls ${SYS_ROOT}/mingw/bin/zlib1.dll"
+dlls="$dlls ${SYS_ROOT}/mingw/bin/libgomp-1.dll"
 
-binaries="$binaries ${SYS_ROOT}/mingw/bin/libgomp-1.dll"
-binaries="$binaries ${SYS_ROOT}/mingw/bin/pthreadGC2.dll"
-
 cp -p \
   $binaries \
+  $dlls \
   $DOCS \
   scripts/batch-example.bat \
   $dir
 
+# Special case copy to work around some case sensitivity bugs with
+# nsiswrapper under linux.
+cp -p ${SYS_ROOT}/mingw/bin/pthreadGC2.dll ${dir}/pthreadgc2.dll
+
 unix2dos $dir/batch-example.bat
 
 if test -r "../wget-1.11.4/wget.exe"; then
@@ -154,4 +159,13 @@
 fi
 
 zip -r $dir-win32.zip $dir
+
+# Optionally, create windows installer if nsiswrapper exists.
+if test -r "/usr/bin/nsiswrapper"; then
+  cd ${dir}
+  export PATH=$PATH:.
+  nsiswrapper --run --name $dir --outfile ../${dir}-win32.exe *.exe *.ini *.txt *.pdf *.bat
+  cd ..
+fi
+
 rm -rf $dir
--- a/osxbuild
+++ b/osxbuild
@@ -41,10 +41,10 @@
 # cd ../lame-398-2
 #./configure --enable-shared --disable-static;make;sudo make install
 #
-# cd ../id3tag-0.15.1b
+# cd ../libid3tag-0.15.1b
 #./configure --enable-shared --disable-static;make;sudo make install
 #
-# cd ../libmad
+# cd ../libmad-0.15.1b
 #./configure --enable-shared --disable-static;make;sudo make install
 
 [ ! -x configure ] && autoreconf -i