diff --git a/clean-classic/windows-x64/build.sh b/clean-classic/windows-x64/build.sh index b4b3fbbf4d8460767cf01f27704d5f1988b8dc08..138d8834e138f026be7a1631dd2b8e347f61258b 100644 --- a/clean-classic/windows-x64/build.sh +++ b/clean-classic/windows-x64/build.sh @@ -109,6 +109,14 @@ git_get () "/c/Program Files/Git/cmd/git.exe" clone --depth 1 "https://gitlab.science.ru.nl/$2" "$w1/$3" } +gitlab_get () + # $1 $2 $3 +{ + w1=`cygpath --absolute --windows "$1"` + log "git '$2' '$3'" + "/c/Program Files/Git/cmd/git.exe" clone --depth 1 "https://www.gitlab.com/$2" "$w1/$3" +} + makedir () # $1: directory path { @@ -373,7 +381,8 @@ cvscleansystem () # svn_get "$1" clean-libraries/trunk/Examples/GenLib CleanExamples/Generics mv "$1/clean-libraries-git/Examples/GenLib" "$1/CleanExamples/Generics" # svn_get "$1" gast libraries/Gast - git_get "$1" clean-and-itasks/gast.git libraries/Gast +# git_get "$1" clean-and-itasks/gast.git libraries/Gast + gitlab_get "$1" clean-and-itasks/gast.git libraries/Gast # svn_get "$1" clean-examples/trunk CleanExamples/Small\ Examples # svn_get "$1" clean-libraries/trunk/Examples/Small\ Examples CleanExamples/Small\ Examples mv "$1/clean-libraries-git/Examples/Small Examples" "$1/CleanExamples/Small Examples" @@ -381,7 +390,8 @@ cvscleansystem () # svn_get "$1" "clean-libraries/trunk/Libraries/$cvscleansystem_lib" "libraries/$cvscleansystem_lib" # done # svn_get "$1" clean-libraries/trunk/Libraries/ArgEnvWindows libraries/ArgEnvWindows - git_get "$1" clean-and-itasks/clean-platform.git libraries/Platform +# git_get "$1" clean-and-itasks/clean-platform.git libraries/Platform + gitlab_get "$1" clean-and-itasks/clean-platform.git libraries/Platform xmakedir "$1/fonts" curl "http://git.ghostscript.com/?p=urw-core35-fonts.git;a=blob_plain;f=NimbusMonoPS-Regular.ttf;hb=refs/heads/master" -H "Host: git.ghostscript.com" -H "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" -H "Accept-Language: en-US,en;q=0.5" --compressed -H "DNT: 1" -H "Connection: keep-alive" -H "Upgrade-Insecure-Requests: 1" > "$1/fonts/NimbusMonoPS-Regular.ttf" @@ -637,11 +647,11 @@ gast_dist () # $1: non-Clean build dir # $2: dist dir { - (cd "$2/Examples/Gast"; $2/cpm.exe project char.prj create; $2/cpm.exe project char.prj target Gast; $2/cpm.exe project char.prj set -b) - (cd "$2/Examples/Gast"; $2/cpm.exe project bool.prj create; $2/cpm.exe project bool.prj target Gast; $2/cpm.exe project bool.prj set -b) - (cd "$2/Examples/Gast"; $2/cpm.exe project int.prj create; $2/cpm.exe project int.prj target Gast; $2/cpm.exe project int.prj set -b) - (cd "$2/Examples/Gast"; $2/cpm.exe project tree.prj create; $2/cpm.exe project tree.prj target Gast; $2/cpm.exe project tree.prj set -b) - (cd "$2/Examples/Gast"; $2/cpm.exe project with_options.prj create; $2/cpm.exe project with_options.prj target Gast; $2/cpm.exe project with_options.prj set -nr) + (cd "$2/Examples/Gast"; $2/cpm.exe -con project char.prj create; $2/cpm.exe -con project char.prj target Gast; $2/cpm.exe -con project char.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe -con project bool.prj create; $2/cpm.exe -con project bool.prj target Gast; $2/cpm.exe -con project bool.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe -con project int.prj create; $2/cpm.exe -con project int.prj target Gast; $2/cpm.exe -con project int.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe -con project tree.prj create; $2/cpm.exe -con project tree.prj target Gast; $2/cpm.exe -con project tree.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe -con project with_options.prj create; $2/cpm.exe -con project with_options.prj target Gast; $2/cpm.exe -con project with_options.prj set -nr) } platform_build () @@ -670,18 +680,18 @@ platform_dist () cp "$1/platform/$base_name.obj" "$2/Libraries/Platform/Clean System Files/$base_name.o" done - (cd "$2/Examples/Platform Examples"; $2/cpm.exe project IPLookup.prj create; $2/cpm.exe project IPLookup.prj target Platform) - (cd "$2/Examples/Platform Examples"; $2/cpm.exe project MapDemo.prj create; $2/cpm.exe project MapDemo.prj target Platform) - (cd "$2/Examples/Platform Examples"; $2/cpm.exe project ProcessDemo.prj create; $2/cpm.exe project ProcessDemo.prj target Platform) - (cd "$2/Examples/Platform Examples"; $2/cpm.exe project SQLDbDemo.prj create; $2/cpm.exe project SQLDbDemo.prj target Platform) - (cd "$2/Examples/Platform Examples"; $2/cpm.exe project WebDemo.prj create; $2/cpm.exe project WebDemo.prj target Platform;\ - $2/cpm.exe project WebDemo.prj path add {Application}\\Libraries\\TCPIP; $2/cpm.exe project WebDemo.prj path move 0 down) + (cd "$2/Examples/Platform Examples"; $2/cpm.exe -con project IPLookup.prj create; $2/cpm.exe -con project IPLookup.prj target Platform) + (cd "$2/Examples/Platform Examples"; $2/cpm.exe -con project MapDemo.prj create; $2/cpm.exe -con project MapDemo.prj target Platform) + (cd "$2/Examples/Platform Examples"; $2/cpm.exe -con project ProcessDemo.prj create; $2/cpm.exe -con project ProcessDemo.prj target Platform) + (cd "$2/Examples/Platform Examples"; $2/cpm.exe -con project SQLDbDemo.prj create; $2/cpm.exe -con project SQLDbDemo.prj target Platform) + (cd "$2/Examples/Platform Examples"; $2/cpm.exe -con project WebDemo.prj create; $2/cpm.exe -con project WebDemo.prj target Platform;\ + $2/cpm.exe -con project WebDemo.prj path add {Application}\\Libraries\\TCPIP; $2/cpm.exe -con project WebDemo.prj path move 0 down) - (cd "$2/Examples/Platform Examples/socket"; $2/cpm.exe project client.prj create; $2/cpm.exe project client.prj target Platform) - (cd "$2/Examples/Platform Examples/socket"; $2/cpm.exe project server.prj create; $2/cpm.exe project server.prj target Platform) + (cd "$2/Examples/Platform Examples/socket"; $2/cpm.exe -con project client.prj create; $2/cpm.exe -con project client.prj target Platform) + (cd "$2/Examples/Platform Examples/socket"; $2/cpm.exe -con project server.prj create; $2/cpm.exe -con project server.prj target Platform) - (cd "$2/Examples/Platform Examples/WebPM"; $2/cpm.exe project PM.prj create; $2/cpm.exe project PM.prj target Platform;\ - $2/cpm.exe project PM.prj path add {Application}\\Libraries\\TCPIP; $2/cpm.exe project PM.prj path move 0 down) + (cd "$2/Examples/Platform Examples/WebPM"; $2/cpm.exe -con project PM.prj create; $2/cpm.exe -con project PM.prj target Platform;\ + $2/cpm.exe -con project PM.prj path add {Application}\\Libraries\\TCPIP; $2/cpm.exe -con project PM.prj path move 0 down) } codegen_build () @@ -1048,7 +1058,14 @@ distduplicate () # $2: directory to put distribution in { # Root - xduplicate "$1/tools/CleanIDE/CleanLicenseConditions.txt" "$2/CleanLicenseConditions.txt" + cat < "$2/CleanLicenseConditions.txt" +Clean is distributed under the terms of the simplified BSD license below, except for +the Platform and Gast libraries and examples. +The files and BSD licenses of these libraries and examples can be found in the directories +Libraries/Platform, Libraries/Gast, Examples/Platform Examples and Examples/Gast. + +EOF +# xduplicate "$1/tools/CleanIDE/CleanLicenseConditions.txt" "$2/CleanLicenseConditions.txt" # Config xduplicate "$1"/tools/CleanIDE/Config "$2"/Config @@ -1074,6 +1091,7 @@ distduplicate () xduplicate "$1/libraries/ArgEnvWindows" "$2/Libraries/ArgEnv" xmakedir "$2/Libraries/Gast" + xduplicate "$1/libraries/Gast/LICENSE" "$2/Libraries/Gast/LICENSE" xduplicate "$1/libraries/Gast/Libraries/Gast.icl" "$2/Libraries/Gast/Gast.icl" xduplicate "$1/libraries/Gast/Libraries/Gast.dcl" "$2/Libraries/Gast/Gast.dcl" xduplicate "$1/libraries/Gast/Libraries/Gast" "$2/Libraries/Gast/Gast" @@ -1096,6 +1114,10 @@ distduplicate () xduplicate3 "$1/libraries/Platform/src/libraries/OS-Windows-64" "$2/Libraries/Platform" xduplicate3 "$1/libraries/Platform/src/libraries/Platform-x86" "$2/Libraries/Platform" + sed -e '1,/License/d' -e 's/LICENSE].LICENCE/LICENCE.Clean](LICENSE.Clean/' -e 's/$/\r/' < "$1/libraries/Platform/README.md" > "$2/Libraries/Platform/LICENSE" + xduplicate "$1/libraries/Platform/LICENSE" "$2/Libraries/Platform/LICENSE.Clean" + xduplicate2 "$1/libraries/Platform/LICENSE.BSD3" "$2/Libraries/Platform" + # xduplicate "$1/tools/Sparkle/Libraries/StdEnv Sparkle 0.0.4a" "$2/Libraries/StdEnv Sparkle" xremove "$2/Libraries/Directory/Clean System Files Macintosh" @@ -1152,6 +1174,7 @@ distduplicate () xmove "$2/Libraries/Parsers/MetarDemo" "$2/Examples/Parsers/MetarDemo" xmakedir "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/LICENSE" "$2/Examples/Gast" xduplicate2 "$1/libraries/Gast/Tests/char.icl" "$2/Examples/Gast" xduplicate2 "$1/libraries/Gast/Tests/bool.icl" "$2/Examples/Gast" xduplicate2 "$1/libraries/Gast/Tests/int.icl" "$2/Examples/Gast" @@ -1160,6 +1183,9 @@ distduplicate () xduplicate "$1/libraries/Platform/src/examples" "$2/Examples/Platform Examples" find "$2/Examples/Platform Examples" -name .gitignore -delete + sed -e '1,/License/d' -e 's/LICENSE].LICENCE/LICENCE.Clean](LICENSE.Clean/' -e 's/$/\r/' < "$1/libraries/Platform/README.md" > "$2/Examples/Platform Examples/LICENSE" + xduplicate "$1/libraries/Platform/LICENSE" "$2/Examples/Platform Examples/LICENSE.Clean" + xduplicate2 "$1/libraries/Platform/LICENSE.BSD3" "$2/Examples/Platform Examples" # Help xduplicate "$1"/tools/CleanIDE/Help "$2"/Help