installer

git-svn-id: file:///raid/svn-personal/tewi/trunk@79 8739d7e6-ffea-ec47-b151-bdff447c6205

diff --git a/Makefile b/Makefile
index 931106aabee1ddd6e08aef46a026a9112e3eced4..c3c1ce7b132c1904e69ddec96bb0690e51345b88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,4 +38,4 @@ clean:
        $(MAKE) -C ./Module $(FLAGS) clean
        $(MAKE) -C ./Common $(FLAGS) clean
        $(MAKE) -C ./Manpage $(FLAGS) clean
-       rm -f ./Server/option
+       rm -f ./Server/option install-*ssl.exe

diff --git a/config.h b/config.h.tmpl
similarity index 87%
rename from config.h
rename to config.h.tmpl
index 7d9d77097be53184ae63574161d44aacebea675f..c00b7a885392ba44ec4f8fd0a9e0a1252f6ddc52 100644 (file)
--- a/config.h
+++ b/config.h.tmpl
@@ -12,3 +12,7 @@
 #endif
 
 #endif
+
+/*
+vim: syntax=c
+*/

diff --git a/installer.sh b/installer.sh
index b830ee2d8492c5cfd6353b6e39c5d600685adc73..5461ec9dc293c0f35f2eebf2680c8a208181e82f 100755 (executable)
--- a/installer.sh
+++ b/installer.sh
@@ -4,11 +4,28 @@
 fail() {
        rm -f tewi-service.exe
        rm -f tewi.exe
+       mv config.h.bak config.h
        exit 1
 }
 
 VERSION=`make get-version`
 
+sed "s/undef NO_SSL/define NO_SSL/g" config.h.tmpl > config.h
+
+make clean || fail
+make PLATFORM=$1 -j4 || fail
+cp Server/tewi.exe tewi.exe
+make clean || fail
+make PLATFORM=$1-service -j4 || fail
+cp Server/tewi.exe tewi-service.exe
+cd Server
+makensis -DVERSION=$VERSION install.nsi
+cp install.exe ../install-nossl.exe
+rm -f tewi.exe tewi-service.exe
+cd ..
+
+sed "s/define NO_SSL/undef NO_SSL/g" config.h.tmpl > config.h
+
 make clean || fail
 make PLATFORM=$1 -j4 || fail
 cp Server/tewi.exe tewi.exe
@@ -17,5 +34,6 @@ make PLATFORM=$1-service -j4 || fail
 cp Server/tewi.exe tewi-service.exe
 cd Server
 makensis -DVERSION=$VERSION install.nsi
+cp install.exe ../install-ssl.exe
 rm -f tewi.exe tewi-service.exe
 cd ..