diff --git a/cesetup/cesetup.coedit b/cesetup/cesetup.coedit index 68229518..1aee6e9c 100644 --- a/cesetup/cesetup.coedit +++ b/cesetup/cesetup.coedit @@ -41,11 +41,13 @@ object CurrentProject: TCENativeProject '' ) preBuildProcess.executable = 'bash' + preBuildProcess.workingDirectory = '' preBuildProcess.options = [poUsePipes, poStderrToOutPut] preBuildProcess.parameters.Strings = ( 'zip-nux32.sh' ) postBuildProcess.executable = 'bash' + postBuildProcess.workingDirectory = '' postBuildProcess.options = [poUsePipes, poStderrToOutPut] postBuildProcess.parameters.Strings = ( 'setupzip-nux-noarch.sh' @@ -64,20 +66,23 @@ object CurrentProject: TCENativeProject '' ) preBuildProcess.executable = 'sh' + preBuildProcess.workingDirectory = '' preBuildProcess.options = [poUsePipes, poStderrToOutPut] preBuildProcess.parameters.Strings = ( 'zip-nux64.sh' ) postBuildProcess.executable = 'sh' + postBuildProcess.workingDirectory = '' postBuildProcess.options = [poUsePipes, poStderrToOutPut] postBuildProcess.parameters.Strings = ( 'setupzip-nux-noarch.sh' '' ) + runOptions.options = [poUsePipes] end> Sources.Strings = ( 'cesetup.d' ) ConfigurationIndex = 2 - version = '3update2' + version = '3update3' end diff --git a/cesetup/cesetup.d b/cesetup/cesetup.d index 6362a59a..0a118ac7 100644 --- a/cesetup/cesetup.d +++ b/cesetup/cesetup.d @@ -41,10 +41,11 @@ immutable Resource[] ceResources = Resource(cast(ImpType) import("coedit.license.txt"), "coedit.license.txt", Kind.doc) ]; -immutable Resource[] dcdResources = +immutable Resource[] thirdPartBinaries = [ Resource(cast(ImpType) import("dcd-server" ~ exeExt), "dcd-server" ~ exeExt, Kind.exe), Resource(cast(ImpType) import("dcd-client" ~ exeExt), "dcd-client" ~ exeExt, Kind.exe), + Resource(cast(ImpType) import("dscanner" ~ exeExt), "dscanner" ~ exeExt, Kind.exe), Resource(cast(ImpType) import("dcd.license.txt"), "dcd.license.txt", Kind.doc) ]; @@ -119,12 +120,13 @@ static this() void main(string[] args) { - bool nodcd; + bool noTools; bool uninstall; bool listfiles; getopt(args, config.passThrough, - "nodcd", &nodcd, + "nodcd", &noTools, + "notools", &noTools, "u|uninstall", &uninstall, "l|list", &listfiles ); @@ -146,7 +148,7 @@ void main(string[] args) fname = targetFilename(res); writefln(fmtRes, fname, exists(fname)); } - foreach (ref res; dcdResources) + foreach (ref res; thirdPartBinaries) { fname = targetFilename(res); writefln(fmtRes, fname, exists(fname)); @@ -179,10 +181,10 @@ void main(string[] args) Formater.justify!'L'("-l | --list: list files and status"); if (!uninstall) { - if (!nodcd) Formater.justify!'L'("--nodcd: skip DCD setup"); Formater.justify!'L'("-u | --uninstall: uninstall"); + if (!noTools) Formater.justify!'L'("--notools: skip DCD and Dscanner setup"); } - else if (!nodcd) Formater.justify!'L'("--nodcd: do not remove DCD"); + else if (!noTools) Formater.justify!'L'("--notools: do not remove DCD and Dscanner"); Formater.justify!'L'("press A to abort or another key to start..."); Formater.separate; @@ -211,7 +213,7 @@ void main(string[] args) Formater.justify!'L'(res.destName ~ oldMsg[done]); failures += !done; } - if (!nodcd) foreach (ref res; dcdResources) + if (!noTools) foreach (ref res; thirdPartBinaries) { done = installResource(res); Formater.justify!'L'(res.destName ~ extractMsg[done]); @@ -254,7 +256,7 @@ void main(string[] args) Formater.justify!'L'(res.destName ~ rmMsg[done]); failures += !done; } - if (!nodcd) foreach (ref res; dcdResources) + if (!noTools) foreach (ref res; thirdPartBinaries) { done = uninstallResource(res); Formater.justify!'L'(res.destName ~ rmMsg[done]); diff --git a/cesetup/deb.sh b/cesetup/deb.sh index 5d31d1ec..d57146e2 100644 --- a/cesetup/deb.sh +++ b/cesetup/deb.sh @@ -43,7 +43,7 @@ Type=Application" > $shcdir/coedit.desktop cd $cfgdir echo "Package: coedit Version: $maj$min -Section: base +Section: devel Priority: optional Date: $dte Architecture: $arch diff --git a/cesetup/version.txt b/cesetup/version.txt index fa153345..8c835796 100644 --- a/cesetup/version.txt +++ b/cesetup/version.txt @@ -1 +1 @@ -3_update_3 +3_update_3 \ No newline at end of file diff --git a/cesetup/zip-nux32.sh b/cesetup/zip-nux32.sh index 6223d6b7..b67f478f 100644 --- a/cesetup/zip-nux32.sh +++ b/cesetup/zip-nux32.sh @@ -8,5 +8,5 @@ zip -9 \ $fld/dcd.license.txt $fld/coedit.license.txt \ $fld/coedit $fld/dastworx \ $fld/coedit.ico $fld/coedit.png \ -$fld/dcd-server $fld/dcd-client +$fld/dcd-server $fld/dcd-client $fld/dscanner rm -rf coedit-x86 diff --git a/cesetup/zip-nux64.sh b/cesetup/zip-nux64.sh index 03c00edf..331a1eec 100644 --- a/cesetup/zip-nux64.sh +++ b/cesetup/zip-nux64.sh @@ -8,5 +8,5 @@ zip -9 \ $fld/dcd.license.txt $fld/coedit.license.txt \ $fld/coedit $fld/dastworx \ $fld/coedit.ico $fld/coedit.png \ -$fld/dcd-server $fld/dcd-client +$fld/dcd-server $fld/dcd-client $fld/dscanner rm -rf coedit-x86_64 diff --git a/cesetup/zip-win32.bat b/cesetup/zip-win32.bat index 16cffb21..704b1f80 100644 --- a/cesetup/zip-win32.bat +++ b/cesetup/zip-win32.bat @@ -7,4 +7,4 @@ cd win32 dcd.license.txt coedit.license.txt^ coedit.exe dastworx.exe^ coedit.ico coedit.png^ - dcd-server.exe dcd-client.exe \ No newline at end of file + dcd-server.exe dcd-client.exe dscanner.exe