From ea0ba59bffdbcb03e300467c6f5d46cabc90e0f1 Mon Sep 17 00:00:00 2001 From: onefang Date: Thu, 2 Sep 2021 22:21:25 +1000 Subject: Move the sledjchisl BUILD code to just after the directory building. And clean up whitespace around that. --- src/sledjchisl/sledjchisl.c | 321 +++++++++++++++++++++++--------------------- 1 file changed, 167 insertions(+), 154 deletions(-) diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index cce4e04..53362f9 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c @@ -2457,60 +2457,7 @@ gitARend: case BUILD : { - if (ourSims->doIt) - { - char *t = xmprintf("%s/current_NEW", scRoot); - - copyOpenSim(t); -/* -# Poor mans git sub modules / subtrees, coz otherwise it gets complex. -#if [ ! -d git-sub-modules/opensim-moneymodule-gloebit ]; then -# pushd git-sub-modules >/dev/null -# git clone https://github.com/gloebit/opensim-moneymodule-gloebit.git -# popd >/dev/null -#else -# pushd git-sub-modules/opensim-moneymodule-gloebit >/dev/null -# git pull -# popd >/dev/null -#fi -#rm -rf addon-modules/Gloebit/GloebitMoneyModule -#cp -r git-sub-modules/opensim-moneymodule-gloebit/addon-modules/Gloebit/GloebitMoneyModule addon-modules/Gloebit/ -*/ - if (shellMeFail("cd %s; ./runprebuild.sh autoclean", t)) E("Failed to autoclean!"); - // Clean the stuff autoclean forgets to clean. I feel so dirty. - if (shellMeFail("cd %s; find -name obj -type d -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); - if (shellMeFail("cd %s; find -name *.csproj -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); - if (shellMeFail("cd %s; find -name *.csproj.* -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); - if (shellMeFail("cd %s; find -name *.pdb -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); - if (shellMeFail("cd %s; rm -fr bin/ScriptEngines", t)) E("Failed to rm ScriptEngines!"); - // Clean the stuff the tests created. - if (shellMeFail("cd %s; rm Test*.txt", t)) E("Failed to Test results!"); -/* -# Prebuild converts Microsoft.CSharp.targets to Microsoft.CSHARP.Targets, which case sensitive file systems fail to find. -#find -name *.csproj | xargs sed -i "s@Microsoft.CSHARP.Targets@Microsoft.CSharp.targets@g" - -# Debian no longer provides nant. -#./nant-color - -if [ "4" == $(mono -V | head -n 1 | cut -d ' ' -f 5 | cut -d '.' -f 1) ]; then - export XBUILD_COLORS=errors=brightred,warnings=yellow,events=blue - xbuild /target:clean - xbuild /p:TargetFrameworkVersion="v4.5"xbuild /p:TargetFrameworkVersion="v4.5" -else - # Use this for Mono 5 and later. - msbuild /p:Configuration=Release -# msbuild /p:Configuration=Debug -fi -*/ - // Use this for Mono 5 and later. - if (shellMeFail("cd %s; ./runprebuild.sh vs2015", t)) E("Failed to prebuild!"); - if (shellMeFail("cd %s; msbuild /p:Configuration=Debug", t)) E("Failed to msbuild!"); -// if (shellMeFail("cd %s; msbuild /p:Configuration=Release", t)) E("Failed to msbuild!"); -// #cp -f addon-modules/Gloebit/GloebitMoneyModule/bin/Gloebit.dll bin - if (shellMeFail("cd %s/src; time ./BuildIt.sh", t)) E("Failed to compile sledjchisl!"); - free(t); - } - ourSims->doIt = 0; + // Done elsewhere. break; } @@ -8554,70 +8501,70 @@ Build the OpenSim. } - if ((!isWeb) && (START == currentMode) && (0 == toys.optc)) + if ((!isWeb) && ((BUILD == currentMode) || (START == currentMode)) && (0 == toys.optc)) { //////////////////////////////////////////////////////////////////////////////////////////////////// // Sort out directories, part 2 //////////////////////////////////////////////////////////////////////////////////////////////////// - // Doing this here coz at this point we should be the correct user, and we only want to do this during initial startup. - /* From man 7 inode - - S_ISUID 04000 set-user-ID bit - S_ISGID 02000 set-group-ID bit (see below) - S_ISVTX 01000 sticky bit (see below) - - S_IRWXU 00700 owner has read, write, and execute permission - S_IRUSR 00400 owner has read permission - S_IWUSR 00200 owner has write permission - S_IXUSR 00100 owner has execute permission - - S_IRWXG 00070 group has read, write, and execute permission - S_IRGRP 00040 group has read permission - S_IWGRP 00020 group has write permission - S_IXGRP 00010 group has execute permission - - S_IRWXO 00007 others (not in group) have read, write, and execute permission - S_IROTH 00004 others have read permission - S_IWOTH 00002 others have write permission - S_IXOTH 00001 others have execute permission - - The set-group-ID bit (S_ISGID) has several special uses. For a directory, it indicates that BSD semantics is to be used for that directory: files created there inherit their group - ID from the directory, not from the effective group ID of the creating process, and directories created there will also get the S_ISGID bit set. For a file that does not have the - group execution bit (S_IXGRP) set, the set-group-ID bit indicates mandatory file/record locking. - - The sticky bit (S_ISVTX) on a directory means that a file in that directory can be renamed or deleted only by the owner of the file, by the owner of the directory, - and by a privileged process - */ - V("Making directories in %s.", scRoot); - if ((! qfile_exist(scBin)) && (! qfile_mkdir(scBin, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scBin); - if ((! qfile_exist(scEtc)) && (! qfile_mkdir(scEtc, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scEtc); - if ((! qfile_exist(scLib)) && (! qfile_mkdir(scLib, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scLib); - if ((! qfile_exist(scBackup)) && (! qfile_mkdir(scBackup, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scBackup); - if ((! qfile_exist(scCache)) && (! qfile_mkdir(scCache, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scCache); - if ((! qfile_exist(scData)) && (! qfile_mkdir(scData, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scData); - if ((! qfile_exist(scLog)) && (! qfile_mkdir(scLog, S_IRWXU, true))) C("Unable to create path %s", scLog); - if ((! qfile_exist(scTemp)) && (! qfile_mkdir(scTemp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scTemp); - tmp = xmprintf("%s/sessions", scCache); - if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); - free(tmp); - tmp = xmprintf("%s/users", scData); - if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); - free(tmp); - tmp = xmprintf("%s/db", scData); - if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); - free(tmp); - tmp = xmprintf("%s/config", scRoot); - if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); - free(tmp); - tmp = xmprintf("%s/AssetFiles/data", scRoot); - if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); - free(tmp); - tmp = xmprintf("%s/AssetFiles/tmp/spool", scRoot); - if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); - free(tmp); - tmp = xmprintf("%s/web", scRoot); - if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); - free(tmp); + // Doing this here coz at this point we should be the correct user, and we only want to do this during initial startup. + /* From man 7 inode - + S_ISUID 04000 set-user-ID bit + S_ISGID 02000 set-group-ID bit (see below) + S_ISVTX 01000 sticky bit (see below) + + S_IRWXU 00700 owner has read, write, and execute permission + S_IRUSR 00400 owner has read permission + S_IWUSR 00200 owner has write permission + S_IXUSR 00100 owner has execute permission + + S_IRWXG 00070 group has read, write, and execute permission + S_IRGRP 00040 group has read permission + S_IWGRP 00020 group has write permission + S_IXGRP 00010 group has execute permission + + S_IRWXO 00007 others (not in group) have read, write, and execute permission + S_IROTH 00004 others have read permission + S_IWOTH 00002 others have write permission + S_IXOTH 00001 others have execute permission + + The set-group-ID bit (S_ISGID) has several special uses. For a directory, it indicates that BSD semantics is to be used for that directory: files created there inherit their group + ID from the directory, not from the effective group ID of the creating process, and directories created there will also get the S_ISGID bit set. For a file that does not have the + group execution bit (S_IXGRP) set, the set-group-ID bit indicates mandatory file/record locking. + + The sticky bit (S_ISVTX) on a directory means that a file in that directory can be renamed or deleted only by the owner of the file, by the owner of the directory, + and by a privileged process + */ + V("Making directories in %s.", scRoot); + if ((! qfile_exist(scBin)) && (! qfile_mkdir(scBin, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scBin); + if ((! qfile_exist(scEtc)) && (! qfile_mkdir(scEtc, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scEtc); + if ((! qfile_exist(scLib)) && (! qfile_mkdir(scLib, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scLib); + if ((! qfile_exist(scBackup)) && (! qfile_mkdir(scBackup, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scBackup); + if ((! qfile_exist(scCache)) && (! qfile_mkdir(scCache, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scCache); + if ((! qfile_exist(scData)) && (! qfile_mkdir(scData, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scData); + if ((! qfile_exist(scLog)) && (! qfile_mkdir(scLog, S_IRWXU, true))) C("Unable to create path %s", scLog); + if ((! qfile_exist(scTemp)) && (! qfile_mkdir(scTemp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", scTemp); + tmp = xmprintf("%s/sessions", scCache); + if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); + free(tmp); + tmp = xmprintf("%s/users", scData); + if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); + free(tmp); + tmp = xmprintf("%s/db", scData); + if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); + free(tmp); + tmp = xmprintf("%s/config", scRoot); + if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); + free(tmp); + tmp = xmprintf("%s/AssetFiles/data", scRoot); + if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); + free(tmp); + tmp = xmprintf("%s/AssetFiles/tmp/spool", scRoot); + if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); + free(tmp); + tmp = xmprintf("%s/web", scRoot); + if ((! qfile_exist(tmp)) && (! qfile_mkdir(tmp, S_IRWXU | S_IRGRP | S_IXGRP, true))) C("Unable to create path %s", tmp); + free(tmp); /* TODO - tighten up security. Make sure correct permissions are set everywhere. @@ -8632,50 +8579,116 @@ Create the /opt/opensim-SC directory structure. . var/run HAS to be setup correctly BEFORE we try to start up tmux. web // Fill it with default web stuff from current -> example.. */ - I("Securing directories and files in %s. This might take a while.", scRoot); - if (shellMeFail("chmod u=rw,go= %s/config/*.ini", scRoot)) C("Can't set proper permissions for %s/config*.ini", scRoot); - if (shellMeFail("chmod u=rw,go= %s/config/ROBUST/*.ini", scRoot)) C("Can't set proper permissions for %s/config/ROBUST/*.ini", scRoot); - if (shellMeFail("chmod u=rw,go= %s/.sledjChisl.conf.lua", scEtc)) C("Can't set proper permissions for %s/.sledjChisl.conf.lua", scEtc); - if (shellMeFail("chmod ug+rw %s/config", scRoot)) C("Can't set proper permissions for %s/config", scRoot); - if (shellMeFail("chmod g+s %s/config", scRoot)) C("Can't set proper permissions for %s/config", scRoot); - if (shellMeFail("chmod u=rw,go= %s/config/*.ini", scRoot)) C("Can't set proper permissions for %s/config/*.ini", scRoot); - if (shellMeFail("chmod u=rw,go= %s/config/ROBUST/*.ini", scRoot)) C("Can't set proper permissions for %s/configROBUST/*.ini", scRoot); - - if (shellMeFail("chmod ug=rwx,o= %s/AssetFiles", scRoot)) C("Can't set proper permissions for %s/AssetFiles", scRoot); - if (shellMeFail("chmod -fR ug=rw,o=,a+X %s", scBackup)) C("Can't set proper permissions for %s", scBackup); - if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scBin)) C("Can't set proper permissions for %s", scBin); - if (shellMeFail("chmod -fR ug=rw,o=,a+X %s", scCache)) C("Can't set proper permissions for %s", scCache); - if (shellMeFail("chmod ug=rwx,o= %s", scCache)) C("Can't set proper permissions for %s", scCache); - if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scData)) C("Can't set proper permissions for %s", scData); - if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scEtc)) C("Can't set proper permissions for %s", scEtc); - if (shellMeFail("chmod u=rw,g=r,o= %s/.sledjChisl.conf.lua", scEtc)) C("Can't set proper permissions for %s/.sledjChisl.conf.lua", scEtc); - if (shellMeFail("chmod g+s %s", scEtc)) C("Can't set proper permissions for %s", scEtc); - if (shellMeFail("chmod a+x %s/*.shini", scEtc)) C("Can't set proper permissions for %s/*.shini", scEtc); - if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scLib)) C("Can't set proper permissions for %s", scLib); - if (shellMeFail("chmod -fR u=rw,u+X,go= %s", scLog)) C("Can't set proper permissions for %s", scLog); - if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scTemp)) C("Can't set proper permissions for %s", scTemp); - -// if (shellMeFail("chmod -R a+x %s/current/*.sh", scRoot)) C("Can't set proper permissions for %s/current/*.sh", scRoot); -// if (shellMeFail("chmod -R a+x %s/current/scripts/*.sh", scRoot)) C("Can't set proper permissions for %s/current/scripts/*.sh", scRoot); -// if (shellMeFail("chmod -R a+x %s/current/scripts/install/*.sh", scRoot)) C("Can't set proper permissions for %s/current/scripts/install/*.sh", scRoot); -// if (shellMeFail("chmod a+x %s/current/scripts/show-console", scRoot)) C("Can't set proper permissions for %s/current/scripts/show-console", scRoot); -// if (shellMeFail("chmod a+x %s/current/scripts/start-sim", scRoot)) C("Can't set proper permissions for %s/current/scripts/start-sim", scRoot); - - char *newPath = xmprintf("%s/current/bin/sledjchisl", scRoot); - tmp = xmprintf("%s/sledjchisl", scBin); - V("Symlinking %s to %s", newPath, tmp); - if (qfile_exist(tmp)) - { - if (shellMeFail("rm %s", tmp)) - E("rm command failed!"); - } - if (0 != symlink(newPath, tmp)) - perror_msg("Symlinking %s to %s", newPath, tmp); - free(tmp); - free(newPath); + I("Securing directories and files in %s. This might take a while.", scRoot); + if (shellMeFail("chmod u=rw,go= %s/config/*.ini", scRoot)) C("Can't set proper permissions for %s/config*.ini", scRoot); + if (shellMeFail("chmod u=rw,go= %s/config/ROBUST/*.ini", scRoot)) C("Can't set proper permissions for %s/config/ROBUST/*.ini", scRoot); + if (shellMeFail("chmod u=rw,go= %s/.sledjChisl.conf.lua", scEtc)) C("Can't set proper permissions for %s/.sledjChisl.conf.lua", scEtc); + if (shellMeFail("chmod ug+rw %s/config", scRoot)) C("Can't set proper permissions for %s/config", scRoot); + if (shellMeFail("chmod g+s %s/config", scRoot)) C("Can't set proper permissions for %s/config", scRoot); + if (shellMeFail("chmod u=rw,go= %s/config/*.ini", scRoot)) C("Can't set proper permissions for %s/config/*.ini", scRoot); + if (shellMeFail("chmod u=rw,go= %s/config/ROBUST/*.ini", scRoot)) C("Can't set proper permissions for %s/configROBUST/*.ini", scRoot); + + if (shellMeFail("chmod ug=rwx,o= %s/AssetFiles", scRoot)) C("Can't set proper permissions for %s/AssetFiles", scRoot); + if (shellMeFail("chmod -fR ug=rw,o=,a+X %s", scBackup)) C("Can't set proper permissions for %s", scBackup); + if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scBin)) C("Can't set proper permissions for %s", scBin); + if (shellMeFail("chmod -fR ug=rw,o=,a+X %s", scCache)) C("Can't set proper permissions for %s", scCache); + if (shellMeFail("chmod ug=rwx,o= %s", scCache)) C("Can't set proper permissions for %s", scCache); + if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scData)) C("Can't set proper permissions for %s", scData); + if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scEtc)) C("Can't set proper permissions for %s", scEtc); + if (shellMeFail("chmod u=rw,g=r,o= %s/.sledjChisl.conf.lua", scEtc)) C("Can't set proper permissions for %s/.sledjChisl.conf.lua", scEtc); + if (shellMeFail("chmod g+s %s", scEtc)) C("Can't set proper permissions for %s", scEtc); + if (shellMeFail("chmod a+x %s/*.shini", scEtc)) C("Can't set proper permissions for %s/*.shini", scEtc); + if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scLib)) C("Can't set proper permissions for %s", scLib); + if (shellMeFail("chmod -fR u=rw,u+X,go= %s", scLog)) C("Can't set proper permissions for %s", scLog); + if (shellMeFail("chmod -fR a=r,ug=rw,a+X %s", scTemp)) C("Can't set proper permissions for %s", scTemp); + + char *newPath = xmprintf("%s/current/bin/sledjchisl", scRoot); + tmp = xmprintf("%s/sledjchisl", scBin); + V("Symlinking %s to %s", newPath, tmp); + if (qfile_exist(tmp)) + { + if (shellMeFail("rm %s", tmp)) + E("rm command failed!"); + } + if (0 != symlink(newPath, tmp)) + perror_msg("Symlinking %s to %s", newPath, tmp); + free(tmp); + free(newPath); + + + if (BUILD == currentMode) + { + char *t = xmprintf("%s/current_NEW", scRoot); + + I("Building opensim-SC."); + copyOpenSim(t); + + if (shellMeFail("chmod -R a+x %s/*.sh", t)) C("Can't set proper permissions for %s/*.sh", t); + if (shellMeFail("chmod -R a+x %s/scripts/*.sh", t)) C("Can't set proper permissions for %s/scripts/*.sh", t); + if (shellMeFail("chmod -R a+x %s/scripts/install/*.sh", t)) C("Can't set proper permissions for %s/scripts/install/*.sh", t); + if (shellMeFail("chmod a+x %s/scripts/show-console", t)) C("Can't set proper permissions for %s/scripts/show-console", t); + if (shellMeFail("chmod a+x %s/scripts/start-sim", t)) C("Can't set proper permissions for %s/scripts/start-sim", t); + +/* +# Poor mans git sub modules / subtrees, coz otherwise it gets complex. +#if [ ! -d git-sub-modules/opensim-moneymodule-gloebit ]; then +# pushd git-sub-modules >/dev/null +# git clone https://github.com/gloebit/opensim-moneymodule-gloebit.git +# popd >/dev/null +#else +# pushd git-sub-modules/opensim-moneymodule-gloebit >/dev/null +# git pull +# popd >/dev/null +#fi +#rm -rf addon-modules/Gloebit/GloebitMoneyModule +#cp -r git-sub-modules/opensim-moneymodule-gloebit/addon-modules/Gloebit/GloebitMoneyModule addon-modules/Gloebit/ +*/ + if (shellMeFail("cd %s; ./runprebuild.sh autoclean", t)) E("Failed to autoclean!"); + // Clean the stuff autoclean forgets to clean. I feel so dirty. + if (shellMeFail("cd %s; find -name obj -type d -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); + if (shellMeFail("cd %s; find -name *.csproj -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); + if (shellMeFail("cd %s; find -name *.csproj.* -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); + if (shellMeFail("cd %s; find -name *.pdb -type f -print | xargs /bin/rm -fr", t)) E("Failed to rm obj!"); + if (shellMeFail("cd %s; rm -fr bin/ScriptEngines", t)) E("Failed to rm ScriptEngines!"); + // Clean the stuff the tests created. + if (shellMeFail("cd %s; rm Test*.txt", t)) E("Failed to Test results!"); +/* +# Prebuild converts Microsoft.CSharp.targets to Microsoft.CSHARP.Targets, which case sensitive file systems fail to find. +#find -name *.csproj | xargs sed -i "s@Microsoft.CSHARP.Targets@Microsoft.CSharp.targets@g" + +# Debian no longer provides nant. +#./nant-color + +if [ "4" == $(mono -V | head -n 1 | cut -d ' ' -f 5 | cut -d '.' -f 1) ]; then + export XBUILD_COLORS=errors=brightred,warnings=yellow,events=blue + xbuild /target:clean + xbuild /p:TargetFrameworkVersion="v4.5"xbuild /p:TargetFrameworkVersion="v4.5" +else + # Use this for Mono 5 and later. + msbuild /p:Configuration=Release +# msbuild /p:Configuration=Debug +fi +*/ + // Use this for Mono 5 and later. + if (shellMeFail("cd %s; ./runprebuild.sh vs2015", t)) E("Failed to prebuild!"); + if (shellMeFail("cd %s; msbuild /p:Configuration=Debug /verbosity:minimal", t)) E("Failed to msbuild!"); +// if (shellMeFail("cd %s; msbuild /p:Configuration=Release /verbosity:minimal", t)) E("Failed to msbuild!"); +// #cp -f addon-modules/Gloebit/GloebitMoneyModule/bin/Gloebit.dll bin + if (shellMeFail("cd %s/src; time ./BuildIt.sh", t)) E("Failed to compile sledjchisl!"); +/* TODO - + figure out what current symlink currently points to + delete that_BACKUP + copy that to that_BACKUP + point the symlink to this +*/ + free(t); + I("Done building opensim-SC."); + goto finished; + } } + //////////////////////////////////////////////////////////////////////////////////////////////////// // Other start up stuff. //////////////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.1