Changeset 217 in Main

Timestamp:

Oct 3, 2024, 4:50:16 AM (6 weeks ago)

Author:

Nishi

Message:

add a script to create specific installer

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• Server/install.nsi (modified) (5 diffs)
• Server/module.c (modified) (1 diff)
• make-installer.sh (added)

trunk/Makefile

@@ -33 +33 @@
 
 ./README: ./README.tmpl ./Server/tw_version.h
-        sed "s/@VERSION@/`grep "define TW_VERSION" Server/tw_version.h | grep -Eo '"[^\]+' | sed -E 's/^"//g'`/g" ./README.tmpl > $@
+        sed "s/@VERSION@/`grep "define TW_VERSION" Server/tw_version.h | grep -Eo '"[^\]+' | sed 's/^"//g'`/g" ./README.tmpl > $@
 
 install: all ./Tool/genconf ./Tool/itworks
@@ -47 +47 @@
 
 get-version:
-        @grep "define TW_VERSION" Server/tw_version.h | grep -Eo '"[^\]+' | sed -E 's/^"//g'
+        @grep "define TW_VERSION" Server/tw_version.h | grep -Eo '"[^\]+' | sed 's/^"//g'
 
 clean:

trunk/Server/install.nsi

@@ -40 +40 @@
         CreateDirectory "$INSTDIR\bin"
         SetOutPath "$INSTDIR"
-        File /oname=LICENSE.txt "../LICENSE"
+        !cd ..
+        File /oname=LICENSE.txt "LICENSE"
         SetOutPath "$INSTDIR\modules"
-        File "../Module/*.dll"
+        !cd Module
+        File "*.dll"
+        !cd ..
         SetOutPath "$INSTDIR\etc"
         SetOverWrite off
-        File /oname=tewi.conf "../generated.conf"
+        File /oname=tewi.conf "generated.conf"
         SetOutPath "$INSTDIR\www"
-        File /oname=index.html "../itworks.html"
-        File /oname=pbtewi.gif "../Binary/pbtewi.gif"
+        File /oname=index.html "itworks.html"
+        !cd Binary
+        File /oname=pbtewi.gif "pbtewi.gif"
+        !cd ..
         SetOutPath "$INSTDIR\www\icons"
-        File "../Icons/*.png"
+        !cd Icons
+        File "*.png"
+        !cd ..
+        !cd Server
         SetOverWrite on
 
@@ -73 +81 @@
 Section "$(EXEC_ONLY)" SEL_EXEC
         SetOutPath "$INSTDIR\bin"
-        File "../tewi.exe"
+        !cd ..
+        File "tewi.exe"
+        !cd Server
         WriteINIStr $INSTDIR\install.ini uninstall service false
 SectionEnd
 
+!ifndef ONLY_EXEC
 Section /o "$(SERV_TOO)" SEL_SERVICE
         WriteINIStr $INSTDIR\install.ini uninstall service true
@@ -88 +99 @@
         CreateDirectory "$INSTDIR\logs"
         SetOutPath "$INSTDIR\bin"
-        File "../tewi.exe"
-        File /oname=tewisrv.exe "../tewi-service.exe"
+        !cd ..
+        File "tewi.exe"
+        File /oname=tewisrv.exe "tewi-service.exe"
+        !cd Server
         FileOpen $9 $INSTDIR\install.bat w
         FileWrite $9 '"$SYSDIR\sc.exe" delete "TewiHTTPd"$\r$\n'
@@ -99 +112 @@
         Delete $INSTDIR\install.bat
 SectionEnd
+!endif
 
 Function .onInit
@@ -107 +121 @@
         !insertmacro StartRadioButtons $1
         !insertmacro RadioButton ${SEL_EXEC}
+        !ifndef ONLY_EXEC
         !insertmacro RadioButton ${SEL_SERVICE}
+        !endif
         !insertmacro EndRadioButtons
 FunctionEnd

trunk/Server/module.c

@@ -29 +29 @@
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__)
 #include <windows.h>
+#include <direct.h>
 #else
 #include <dlfcn.h>