From d01a617bc03258fda930a12ae0e5109d83f63f1c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jul 2022 13:15:45 +0200 Subject: [PATCH] remove Sparkle from clean-classic windows-x86 --- clean-classic/windows-x86/build.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/clean-classic/windows-x86/build.sh b/clean-classic/windows-x86/build.sh index 2d4b54c..9b6b602 100644 --- a/clean-classic/windows-x86/build.sh +++ b/clean-classic/windows-x86/build.sh @@ -438,7 +438,7 @@ cvscleansystem () git_get "$1" clean-and-itasks/clean-ide.git tools/CleanIDE # svn_get "$1" clean-language-report/trunk LanguageReport git_get "$1" clean-compiler-and-rts/language-report.git LanguageReport - svn_get "$1" sparkle/trunk tools/Sparkle +# svn_get "$1" sparkle/trunk tools/Sparkle svn_get "$1" clean-tools/trunk/htoclean tools/htoclean # svn_get "$1" clean-libraries/trunk/Libraries/GenLib libraries/GenLib mv "$1/clean-libraries-git/Libraries/GenLib" "$1/libraries/GenLib" @@ -578,7 +578,7 @@ runtimesystem_dist () { for objectfile in _startup1.o _startup1Profile.o _startup1Trace.o _startup2.o ; do xduplicate2 "$1/RuntimeSystem/$objectfile" "$2/Libraries/StdEnv/Clean System Files" - xduplicate2 "$1/RuntimeSystem/$objectfile" "$2/Libraries/StdEnv Sparkle/Clean System Files" +# xduplicate2 "$1/RuntimeSystem/$objectfile" "$2/Libraries/StdEnv Sparkle/Clean System Files" done } @@ -882,7 +882,8 @@ hildeobjects_dist () xduplicate "$1"/hildeobjects/windowsTcpIp.obj "$2/Libraries/Hilde/OS Windows/Clean System Files/windowsTcpIp.obj" } -CLEAN_COMPONENTS="compiler compiler_itask dynamic_lib stdenv ide dynamic sparkle htoclean language_report" +#CLEAN_COMPONENTS="compiler compiler_itask dynamic_lib stdenv ide dynamic sparkle htoclean language_report" +CLEAN_COMPONENTS="compiler compiler_itask dynamic_lib stdenv ide dynamic htoclean language_report" cleanduplicate () # $1: source path @@ -1215,7 +1216,7 @@ distcreatedirs () xmakedir "$1/Tools/Dynamics/system dynamics" xmakedir "$1/Tools/Heap Profiler" xmakedir "$1/Tools/Time Profiler" - xmakedir "$1/Tools/Sparkle" +# xmakedir "$1/Tools/Sparkle" } distduplicate () @@ -1242,10 +1243,10 @@ EOF xduplicate "$1/tools/htoclean" "$2/Tools/htoclean" xduplicate "$1/tools/CleanIDE/HeapProfile/ShowHeapProfileHelp" "$2/Tools/Heap Profiler/ShowHeapProfileHelp" xduplicate "$1/tools/CleanIDE/TimeProfile/ShowTimeProfileHelp" "$2/Tools/Time Profiler/ShowTimeProfileHelp" - xduplicate "$1/tools/Sparkle/Tools/Changes.txt" "$2/Tools/Sparkle/Changes.txt" - xduplicate "$1/tools/Sparkle/Tools/options" "$2/Tools/Sparkle/options" - xduplicate "$1/tools/Sparkle/Tools/Images" "$2/Tools/Sparkle/Images" - xduplicate "$1/tools/Sparkle/Tools/Sections" "$2/Tools/Sparkle/Sections" +# xduplicate "$1/tools/Sparkle/Tools/Changes.txt" "$2/Tools/Sparkle/Changes.txt" +# xduplicate "$1/tools/Sparkle/Tools/options" "$2/Tools/Sparkle/options" +# xduplicate "$1/tools/Sparkle/Tools/Images" "$2/Tools/Sparkle/Images" +# xduplicate "$1/tools/Sparkle/Tools/Sections" "$2/Tools/Sparkle/Sections" # Libraries for distduplicate_library in $CLEAN_LIBRARIES; do @@ -1282,7 +1283,7 @@ EOF 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" +# xduplicate "$1/tools/Sparkle/Libraries/StdEnv Sparkle 0.0.4a" "$2/Libraries/StdEnv Sparkle" xremove "$2/Libraries/Directory/Clean System Files Macintosh" xremove "$2/Libraries/Directory/Clean System Files Unix" # xremove "$2/Libraries/ExtendedArith/ExtendedArith/Clean System Files Macintosh" -- GitLab