build stuff

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

diff --git a/Koakumafile b/Koakumafile
index bbd351dcbe2d13a7bbb3de338d9fc393a5abbc94..9c849f3d818845252f46d80ee087bcbb086610f8 100644 (file)
--- a/Koakumafile
+++ b/Koakumafile
@@ -5,10 +5,12 @@ proc run {project_name} {
        set once 1
        while 1 {
                set suf ""
+               set arg ""
                exec sed "s/undef NO_SSL/define NO_SSL/g" config.h.tmpl > config.h
                if { $once == 0 } {
                        exec sed -i "s/undef BUILD_GUI/define BUILD_GUI/g" config.h
                        set suf "-gui"
+                       set arg " BUILD_GUI"
                }
                set ::env(DISPLAY) ":0"
                RunCommand "make clean"
@@ -62,7 +64,7 @@ proc run {project_name} {
                                }
                        }
                        set win "win$bits"
-                       RunCommand "./installer.sh $win"
+                       RunCommand "./installer.sh $win$arg"
                        RunCommand "doas mkdir -p /raid/f/g/tewi/$win"
                        RunCommand "doas mkdir -p /raid/ftp/pub/tewi/$win"
                        RunCommand "doas cp install-ssl.exe /raid/f/g/tewi/$win/tewiinst$bits-[exec make get-version]-ssl$suf.exe"

diff --git a/installer.sh b/installer.sh
index bd8121ddf02fd8e13726096ec9abaf6de61fd02a..c3a5a71d629c604318cf11046471866da5610161 100755 (executable)
--- a/installer.sh
+++ b/installer.sh
@@ -20,6 +20,9 @@ rm -f install-nossl.exe install-ssl.exe
 VERSION=`make get-version`
 
 sed "s/undef NO_SSL/define NO_SSL/g" config.h.tmpl > config.h
+if [ ! "x$2" = "x" ]; then
+       sed -i "s/undef $2/define $2/g" config.h
+fi
 
 make clean || fail
 make PLATFORM=$1 PREFIX=C:/Tewi -j4 || fail
@@ -36,6 +39,9 @@ rm -f tewi.exe tewi-service.exe
 cd ..
 
 sed "s/define NO_SSL/undef NO_SSL/g" config.h.tmpl > config.h
+if [ ! "x$2" = "x" ]; then
+       sed -i "s/undef $2/define $2/g" config.h
+fi
 
 make clean || fail
 make PLATFORM=$1 -j4 PREFIX=C:/Tewi|| fail