From 2ddd87ac61db4f219dcd38c5157e709c82d59f8c Mon Sep 17 00:00:00 2001 From: Nishi Date: Wed, 9 Oct 2024 03:06:28 +0000 Subject: [PATCH] build stuff git-svn-id: file:///raid/svn-personal/tewi/trunk@288 8739d7e6-ffea-ec47-b151-bdff447c6205 --- Koakumafile | 4 +++- installer.sh | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Koakumafile b/Koakumafile index bbd351d..9c849f3 100644 --- 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 bd8121d..c3a5a71 100755 --- 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 -- 2.43.0