test

Author: bagheadspidey

build-linux.sh

@@ -4,7 +4,9 @@
 echo building unwad
 
 cd include/minizip
-./build.sh
+gcc -c \
+-Dunix=1 \
+minizip.c miniunz.c zip.c unzip.c ioapi.c
 cd ../..
 
 g++ -Wall \
@@ -16,5 +18,17 @@ include/minizip/minizip.o include/minizip/ioapi.o include/minizip/zip.o include/
 
 strip unwad
 
+echo building unwad.static
+
+g++ -Wall \
+-I./include/pngpp -I./include \
+unwad.cpp qmus2mid.cpp \
+include/minizip/minizip.o include/minizip/ioapi.o include/minizip/zip.o include/minizip/unzip.o \
+/usr/lib/libmagic.a /usr/lib/libpng.a /usr/lib/libz.a \
+-o unwad.static
+
+strip unwad.static
+
 cd include/minizip
-rm *.o
+rm *.o
+cd ../..

build.bat

@@ -1 +1,19 @@
-g++ -Wall -DMSW=1 unwad.cpp qmus2mid.cpp -I./include -I./include/pngpp -Ldll -lmagic1 -lzlib1 -lregex2 -llibpng13  -o unwad.exe
+echo X                                                 X
+echo X                                                 X
+echo X  Warning: this batch file has not been tested.  X
+echo X                                                 X
+echo X                                                 X
+
+g++ filechars.cpp -o filechars.exe
+filechars readme.txt
+del filechars.exe
+
+cd include\minizip
+gcc -c -DWIN32=1 -I.\include -I.. minizip.c miniunz.c zip.c unzip.c iowin32.c ioapi.c
+cd ..\..
+
+g++ -Wall -DMSW=1 unwad.cpp qmus2mid.cpp -I./include -I./include/pngpp -Ldll -lmagic1 -lzlib1 -lregex2 -llibpng13  -o unwad.exe
+
+cd include\minizip
+del *.o
+cd ..\..

build.sh

@@ -1,10 +1,37 @@
 
 # build for linux and windows
 
-gcc -lstdc++ filechars.cpp -o filechars
+echo converting text files
+
+g++ filechars.cpp -o filechars
 ./filechars readme.txt
 rm filechars
 
 ./build-linux.sh
 
-./cross-compile.sh
+./cross-compile.sh
+
+rm *.txt.h
+
+echo preparing release packages
+
+mkdir release/l; mkdir release/w
+export l=./release/l/unwad/
+export w=./release/w/unwad/
+mkdir $l; mkdir $w
+mkdir $l/magic; mkdir $w/magic
+cp  magic/* $l/magic; cp  magic/* $w/magic
+cp *.txt $l; cp *.txt $w
+mv unwad.static $l/unwad
+mv unwad.exe $w; cp *.dll $w
+
+cd ./release/l/
+rm ../linux/unwad.tar.gz
+tar -cvvf ../linux/unwad.tar unwad/
+gzip ../linux/unwad.tar
+
+cd ../w/
+rm ../windows/unwad.zip 
+zip -r ../windows/unwad.zip unwad/
+
+cd ../.. ; rm -r release/l; rm -r release/w

cross-compile.sh

@@ -4,7 +4,10 @@
 echo cross-compiling unwad.exe for windows
 
 cd include/minizip
-./cross-compile.sh
+i586-mingw32msvc-gcc -c \
+ -DWIN32=1 \
+ -I./include -I.. \
+minizip.c miniunz.c zip.c unzip.c iowin32.c ioapi.c
 cd ../..
 
 i586-mingw32msvc-g++ -Wall  \
@@ -20,4 +23,5 @@ include/minizip/minizip.o include/minizip/ioapi.o include/minizip/iowin32.o incl
 i586-mingw32msvc-strip unwad.exe
 
 cd include/minizip
-rm *.o
+rm *.o
+cd ../..

filechars.cpp

@@ -2,12 +2,12 @@
 
 #include <vector>
 #include <string>
-#include <fstream>
 #include <sstream>
+#include <fstream>
 
 using namespace std;
 
-// escape control chars and wrap with quotes
+// escape special chars and add line breaks
 string prepareLine(string instr)
 {
   stringstream ss("");
@@ -32,7 +32,6 @@ string cleanFileName(char *fn)
   return ss.str();
 }
 
-// write string declaration given a variable name
 string header(string varname)
 {
   return "const char *" + varname + " = \"\\\n";
@@ -68,8 +67,8 @@ int main(int argc,char **argv)
   }
   catch (exception const &error)
   {
-      printf("%s: exception: %s \n",argv[0], error.what());
-      return EXIT_FAILURE;
+    printf("%s: exception: %s \n",argv[0], error.what());
+    return EXIT_FAILURE;
   }
   return EXIT_SUCCESS;
 }

readme.txt

@@ -59,14 +59,28 @@ unwad [options] <wad> [<wad2> ...]
                   -g N is interpreted as a replacement in the form of
                   s/((.{N}).*)/\2/\1 where N is a one-digit integer.
 
-  -w              Convert sounds to WAV format instead of FLAC.
-                  (not implemented)
-
-Operations that deal with lump names occur in the same order as the
-options are listed. For example:
-
-  * If you don't use the -u option (uppercase), any regex should look for
-    lower-case lump names.
+  -i <F>          Convert images to format F. F can be one of either 
+                  "png" or "raw" (without the quotes). Default image
+                  format is png.
+                  (planned feature, not implemented yet)
+                  
+  -n <F>          Convert sounds to format F. F can be one of either 
+                  "wav", "au", or "raw" (without the quotes). Default 
+                  sound format is wav.
+                  (planned feature, not implemented yet)
+
+  -m <F>          Convert music to format F. F can be one of either 
+                  "mid" or "raw" (without the quotes). Default music
+                  format is mid.
+                  (planned feature, not implemented yet)
+
+  --raw           Don't do any conversion (same as -i raw -n raw -m raw).
+                  Subsequent -i, -n, or -m arguments will override --raw
+                  for that lump type.
+                  (planned feature, not implemented yet)
+
+All regular expressions are case-insensitive. Operations that deal with 
+lump names occur in the same order as the options are listed.
 
   * If you use both -f and -r, -f should look for lump names as they
     would appear before being renamed by -r.
@@ -94,15 +108,20 @@ should all be escaped so the command line doesn't eat them.
 
 Example usage:
 
+  # extract all lumps from DOOM2.WAD
+  unwad DOOM2.WAD
+
+  # extract the PLAYPAL lump from DOOM2.WAD
+  unwad -f a/playpal DOOM2.WAD
+
   # extract all lumps from mypwad.wad, using palette file "playpal.lump"
   unwad -p playpal.lump mypwad.wad
 
   # extract all archvile sprites and noises from DOOM2.WAD
   unwad -t sn -f n/dsvi -f s/vile DOOM2.WAD
 
-  # export all rock and slime flats from DOOM2.WAD
-  # (notice you must escape the pipe character so the command line
-  # doesn't eat it!)
+  # export all rock and slime flats from DOOM2.WAD. Notice the escape 
+  # character (back slash) before '|'.
   unwad -t f -f f/rock\|slime DOOM2.WAD
 
   # extract all sprites and noises from HERETIC.WAD, renaming sprites
@@ -112,4 +131,4 @@ Example usage:
 
   # extract all lumps from DOOM2.WAD, leaving lump names in upper-case,
   # ignoring unknown lumps beginning with "DP" (pc speaker sounds)
-  unwad -u -f u/!^DP DOOM2.WAD
+  unwad -u -f u/!^dp DOOM2.WAD