X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=arch%2Fwin32%2Fmakepackage.sh;fp=win32%2Fmakepackage.sh;h=793e43589f39bd699ba6bfecb2fbf0b4973afe5e;hp=0cb48857b6e0e3964319ea335dcf96cb5ba580e8;hb=cf4c819df08e2ab6c06532d8a4467fa58b2792ae;hpb=705fbbaf9a8064c034d23119e912da028af7fac7

diff --git a/win32/makepackage.sh b/arch/win32/makepackage.sh
similarity index 85%
rename from win32/makepackage.sh
rename to arch/win32/makepackage.sh
index 0cb4885..793e435 100755
--- a/win32/makepackage.sh
+++ b/arch/win32/makepackage.sh
@@ -4,18 +4,22 @@
 # Yoink
 # Run this script to create a win32 package.
 #
+# You should typically only run this through the "portable" and "installer"
+# makes targets in the package root directory.  The build system will take
+# care to pass the correct arguments.
+#
 
-function showhelp()
+showhelp()
 {
-	echo "Create a portable win32 package or installer."
 	echo "Usage: $0 [-h] [-i makensis] [-s strip] -d assets -V version -p prefix"
+	echo "  Creates a portable win32 package or installer."
 	echo ""
+	echo "  -V  Specify the version of the program to be packaged"
 	echo "  -d  Specify the game assets to be included."
 	echo "  -h  Show this help an exit."
 	echo "  -i  To make an installer, specify the makensis program."
-	echo "  -V  Specify the version of the program to be packaged"
-	echo "  -s  To strip the binaries, specify the strip program."
 	echo "  -p  Specify the path to your toolchain installation."
+	echo "  -s  To strip the binaries, specify the strip program."
 }
 
 while getopts ":V:hd:i:p:s:" opt
@@ -54,7 +58,7 @@ then
 	exit 1
 fi
 
-function die()
+die()
 {
 	rm -rf "$BUILD"
 	echo "die:" $@
@@ -66,8 +70,8 @@ BUILD="$ROOT/tmp-$$"
 DIRECTORY="yoink-$VERSION"
 ARCHIVE="$BUILD/$DIRECTORY"
 
-MAN2HTML="$ROOT/doc/man2html.sh"
-UNIX2DOS="$ROOT/win32/unix2dos.sh"
+MAN2HTML="lua $ROOT/doc/man2html.lua"
+UNIX2DOS="$ROOT/arch/win32/unix2dos.sh"
 
 DLLS="libogg-0 libpng14 libvorbis-0 libvorbisfile-3 lua51 OpenAL32 SDL zlib1"
 
@@ -105,8 +109,8 @@ do
 	"$UNIX2DOS" "$doc" "$ARCHIVE/$doc.txt" || die "unix2dos $doc"
 done
 
-"$MAN2HTML" -f -o "$ARCHIVE/Manual.html"
-"$UNIX2DOS" "$ARCHIVE/Manual.html"
+$MAN2HTML -o "$ARCHIVE/Manual.html"
+$UNIX2DOS "$ARCHIVE/Manual.html"
 
 cp -rf "$ROOT/doc/licenses" "$ARCHIVE" || die "copying doc/licenses"
 cd "$ARCHIVE/licenses"
@@ -133,7 +137,7 @@ else
 # build an installer
 	NAME="yoinksetup-$VERSION.exe"
 	cd "$BUILD"
-	cp "$ROOT/win32/yoink.nsi" .
+	cp "$ROOT/arch/win32/yoink.nsi" .
 	"$MAKENSIS" -DROOTPATH="$ROOT" -DINSTALLFILES="$ARCHIVE" \
 		-DVERSION="$VERSION" -DOUTFILE="$NAME" yoink.nsi \
 		|| die "running '$MAKENSIS'"