--- a/Hello_utf8.wsp Sun Sep 04 20:30:44 2016 +0100
+++ b/Hello_utf8.wsp Thu Nov 24 22:00:02 2016 +0000
@@ -5,15 +5,15 @@
สวัสดี ! merhaba ! привiт ! olá !
encoding: utf8
- If there are any characters missing or looking strange for your required
- language in the above text, make sure you have an iso10646-1 (i.e. unicode) font
- containing the required glyphs available on your system and change the
- corresponding font setting (Text-Font).
- You will find this setting in the Launcher's "System-Settings"-Dialog,
- in the Subitem "Viewstyle-Fonts".
+ If there are any characters missing or looking strange in your language
+ in the above text, make sure you have an iso10646-1 (i.e. unicode) font
+ containing the required glyphs on your system and change the corresponding
+ font setting (Text-Font).
+ You will find this setting in the Launcher's "System" -> "Settings"-Dialog,
+ under the "Viewstyle" -> "Fonts" tab.
- You can change the font of this view via the "More-Misc-Font" item
- of this view's popUpMenu.
+ You can change the font of this view via the "More" -> "Font..." item
+ of this view's popUpMenu (right click).
Notice:
this setting is only relevant, if you intent to use non-latin
@@ -22,8 +22,9 @@
however, missing characters will then be drawn using a replacement glyph.
Notice to MS-Windows-XP Users:
- You may need to install additional language sets (especially complete
- fonts) in order to see all character glyphs correctly.
+ You may need to install additional language sets
+ (especially complete fonts) in order to see all character
+ glyphs correctly.
Samples:
--- a/Hello_utf8_de.wsp Sun Sep 04 20:30:44 2016 +0100
+++ b/Hello_utf8_de.wsp Thu Nov 24 22:00:02 2016 +0000
@@ -5,24 +5,24 @@
สวัสดี ! merhaba ! привiт ! olá !
encoding: utf8
- Sollten im obigen Text Zeichen fehlen, oder falsch dargestellt werden,
+ Sollten im obigen Text Zeichen fehlen oder falsch dargestellt werden,
so ändern Sie bitte die Voreinstellung des Zeichensatzes so,
dass ein ISO10646-1 (i.e. Unicode) Zeichensatz als Default-Zeichensatz eingestellt ist.
- Diese Voreinstellung findet sich im "System-Einstellungen"-Dialog des Launchers,
- unter dem Unterpunkt "Fensterstil-Zeichensätze".
+ Diese Voreinstellung findet sich im "System" -> "Einstellungen"-Dialog des Launchers,
+ unter dem Unterpunkt "Fensterstil"->"Zeichensätze".
- Der Zeichensatz eines einzelnen Fensters kann über den "Weitere"->"Verschiedenes"->"Zeichensatz"
- Eintrag des PopUp-Menus des jeweiligen Fensters ausgewählt werden.
+ Der Zeichensatz eines einzelnen Fensters kann über den Menupunkt
+ "Weitere"->"Zeichensatz" des PopUp-Menus eines Textfensters ausgewählt werden.
Hinweis:
- diese Einstellung ist nur dann relevant, wenn Sie nicht-lateinische Sprachen
+ diese Einstellung ist nur dann relevant, wenn Sie nicht-lateinische Zeichen
darzustellen haben - insbesondere Sprachen aus dem fernen- und mittleren Osten.
- Smalltalk/X kann auch ohne Unicode-Zeichensatz ausgeführt werden - allerdings
- werden dann fehlende Zeichen falsch dargestellt.
+ Smalltalk/X kann auch ohne Unicode-Zeichensatz ausgeführt werden
+ - allerdings werden dann fehlende Zeichen falsch dargestellt.
Hinweis für MS-Windows-XP Anwender:
- Möglicherweise müssen Sie zusätzliche Sprachpakete installieren (insbesondere
- Zeichensätze) um alle Zeichen korrekt dargestellt zu erhalten.
+ Möglicherweise müssen Sie zusätzliche Sprachpakete installieren
+ (insbesondere Zeichensätze) um alle Zeichen korrekt dargestellt zu erhalten.
Beispiele:
@@ -34,5 +34,3 @@
Mathematisch: ∀∆√∫≠≤≥⌐⌠⌡
Japanisch: 日本語
Chinesisch: 欢迎光临
-
-
--- a/Make.proto Sun Sep 04 20:30:44 2016 +0100
+++ b/Make.proto Thu Nov 24 22:00:02 2016 +0000
@@ -192,6 +192,7 @@
$(TARGET)_static: $(COMMON_OBJS) $(STATIC_LIBRUN)
@echo "making statically linked smalltalk ..."
@$(MAKE) linkTarget \
+ rebaseLibsRule=$(rebaseLibsRule_static) \
LIBOBJS="" \
LINK_OBJS="$(STATIC_OBJS) $(STATIC_EXTRA_UI_OBJ)" \
LINK_LIBOBJS="$(STATIC_LIBOBJS) $(STATIC_EXTRA_UI_OBJ)" \
@@ -402,12 +403,12 @@
hdUtil:
-rm -f stx.dmg /tmp/stx.dmg
(cd /tmp ; hdiutil create -fs HFSX -layout SPUD "stx.dmg" -srcfolder "$(DMG_TMP)" -format UDRW -volname "stx" -quiet)
- sync
- sleep 2
+ @-sync
+ @-sleep 2
$(MAKE) dmg_mount_script
hdiutil convert "/tmp/stx.dmg" -format UDZO -imagekey zlib-level=9 -o "/tmp/stx_cmpr.dmg"
- rm /tmp/stx.dmg
- mv /tmp/stx_cmpr.dmg /tmp/stx.dmg
+ @-rm /tmp/stx.dmg
+ @-mv /tmp/stx_cmpr.dmg /tmp/stx.dmg
dmg: $(DMG_TMP)
@@ -423,6 +424,7 @@
cp "../../COPYRIGHT" "$(DMG_TMP)"/COPYRIGHT.txt
-mkdir "$(DMG_TMP)"/stx.app
-mkdir "$(DMG_TMP)"/stx.app/Contents
+ cp deploySupport/osx_Info.plist "$(DMG_TMP)"/stx.app/Contents/Info.plist
-mkdir "$(DMG_TMP)"/stx.app/Contents/MacOS
$(MAKE) dmgSTXPackages
$(MAKE) dmgBINContents
@@ -435,13 +437,15 @@
# tell the Finder to resize the window, set the background,
# change the icon size, place the icons in the right position, etc.
dmg_mount_script:
- sync
+ @-hdiutil detach /Volumes/stx
+ @-hdiutil detach /Volumes/stx
+ @-sync
hdiutil attach -readwrite -noverify /tmp/stx.dmg
- sync
- sleep 3
- cat ../../rules/macosx_osascript.script | osascript
+ @-sync
+ @-sleep 3
+ @-(cat ../../rules/macosx_osascript.script | osascript)
hdiutil detach /Volumes/stx
- sync
+ @-sync
#
# the actual executable and its binaries
@@ -473,6 +477,225 @@
clean_dmg:
$(MAKE) cleanTemporaryDeploymentHierarchy TMP_TOP="$(DMG_TMP)/stx.app/Packages"
+# (ongoing work)
+# install the binaries and required headers into a user-private framework
+#
+VSN=`cat $(TOP)/RELEASE`
+FRAMEWORK_DST=~/Library/Frameworks/SmalltalkX.framework
+OSX_LIBS=$(STANDARD_RELDIR)
+
+# see http://bomutils.dyndns.org/tutorial.html
+
+PKG_TMP=/tmp/stx_pkg
+
+tmp_pkg: linkLibs
+ @-rm -rf $(PKG_TMP)
+ @-mkdir $(PKG_TMP)
+ # @-mkdir $(PKG_TMP)/flat
+ # @-mkdir $(PKG_TMP)/flat/base.pkg
+ # @-mkdir $(PKG_TMP)/flat/Resources
+ # @-mkdir $(PKG_TMP)/flat/Resources/en.lproj
+ # @-cp banner8.png $(PKG_TMP)/flat/Resources/en.lproj/background.png
+ # @-cp $(TOP)/README $(PKG_TMP)/flat/Resources/en.lproj/
+ # @-cp $(TOP)/README.macosx $(PKG_TMP)/flat/Resources/en.lproj/
+ # @-cp $(TOP)/COPYRIGHT $(PKG_TMP)/flat/Resources/en.lproj/
+ @-mkdir $(PKG_TMP)/root
+ @-mkdir $(PKG_TMP)/root/Library
+ @-mkdir $(PKG_TMP)/root/Library/Frameworks
+ @-mkdir $(PKG_TMP)/root/Library/Frameworks/SmalltalkX.framework
+ $(MAKE) osx_install FRAMEWORK_DST=$(PKG_TMP)/root/Library/Frameworks/SmalltalkX.framework
+ pkgbuild --identifier stx.base --version $(VSN) --root $(PKG_TMP)/root SmalltalkX_Runtime_$(VSN).pkg
+
+ $(MAKE) osx_installHeaders FRAMEWORK_DST=$(PKG_TMP)/root/Library/Frameworks/SmalltalkX.framework
+ pkgbuild --identifier stx.base.headers --version $(VSN) --root $(PKG_TMP)/root SmalltalkX_Headers_$(VSN).pkg
+
+ $(MAKE) osx_installSource FRAMEWORK_DST=$(PKG_TMP)/root/Library/Frameworks/SmalltalkX.framework
+ pkgbuild --identifier stx.base.source --version $(VSN) --root $(PKG_TMP)/root SmalltalkX_Source_$(VSN).pkg
+
+ $(MAKE) osx_installDocumentation FRAMEWORK_DST=$(PKG_TMP)/root/Library/Frameworks/SmalltalkX.framework
+ pkgbuild --identifier stx.base.documentation --version $(VSN) --root $(PKG_TMP)/root SmalltalkX_Documentation_$(VSN).pkg
+
+ productbuild --package SmalltalkX_Runtime_$(VSN).pkg \
+ --package SmalltalkX_Headers_$(VSN).pkg \
+ --package SmalltalkX_Source_$(VSN).pkg \
+ --package SmalltalkX_Documentation_$(VSN).pkg \
+ SmalltalkX$(VSN).pkg
+ # see https://developer.apple.com/library/content/documentation/DeveloperTools/Reference/DistributionDefinitionRef/Chapters/Distribution_XML_Ref.html
+ rm -rf SmalltalkX$(VSN)_pkg
+ pkgutil --expand SmalltalkX$(VSN).pkg SmalltalkX$(VSN)_pkg
+ cp SmalltalkX$(VSN)_pkg/Distribution Distribution.extracted
+ cp deploySupport/osx_Distribution SmalltalkX$(VSN)_pkg/Distribution
+ mkdir SmalltalkX$(VSN)_pkg/Resources
+ mkdir SmalltalkX$(VSN)_pkg/Resources/en.lproj
+ mkdir SmalltalkX$(VSN)_pkg/Resources/de.lproj
+ # mkdir SmalltalkX$(VSN)_pkg/Resources/icons
+ # (cd SmalltalkX$(VSN)_pkg/Resources ; ln -s en.lproj english)
+ # (cd SmalltalkX$(VSN)_pkg/Resources ; ln -s de.lproj german)
+ cp banner8_light.png SmalltalkX$(VSN)_pkg/Resources/en.lproj/background.png
+ cp banner8_light.png SmalltalkX$(VSN)_pkg/Resources/de.lproj/background.png
+ # cp $(TOP)/doc/online/icons/exeptLogo.gif SmalltalkX$(VSN)_pkg/Resources/icons/
+ cp $(TOP)/doc/online/english/LICENCE_FREE_STX.html SmalltalkX$(VSN)_pkg/Resources/en.lproj/LICENCE_FREE_STX.html
+ cp $(TOP)/doc/online/english/LICENCE_STX.html SmalltalkX$(VSN)_pkg/Resources/en.lproj/LICENCE_STX.html
+ cp $(TOP)/doc/online/german/LICENCE_FREE_STX.html SmalltalkX$(VSN)_pkg/Resources/de.lproj/LICENCE_FREE_STX.html
+ cp $(TOP)/doc/online/german/LICENCE_STX.html SmalltalkX$(VSN)_pkg/Resources/de.lproj/LICENCE_STX.html
+ rm SmalltalkX$(VSN).pkg
+ pkgutil --flatten SmalltalkX$(VSN)_pkg SmalltalkX$(VSN).pkg
+ @echo "package generated as SmalltalkX$(VSN).pkg"
+
+# echo " <?xml version=\"1.0\" encoding=\"utf-8\"?>" >> $(PKG_TMP)/flat/Distribution
+# echo " <installer-gui-script minSpecVersion=\"1\">" >> $(PKG_TMP)/flat/Distribution
+# echo " <title>Smalltalk/X 7.1.0</title>" >> $(PKG_TMP)/flat/Distribution
+# echo " <options customize=\"never\" allow-external-scripts=\"no\"/>" >> $(PKG_TMP)/flat/Distribution
+# echo " <domains enable_anywhere=\"true\"/>" >> $(PKG_TMP)/flat/Distribution
+# echo " <installation-check script=\"install_check();\"/>" >> $(PKG_TMP)/flat/Distribution
+# echo " <script><![CDATA[" >> $(PKG_TMP)/flat/Distribution
+# echo " function install_check() {" >> $(PKG_TMP)/flat/Distribution
+# echo " if(!(system.compareVersions(system.version.ProductVersion,'10.5') >= 0)) {" >> $(PKG_TMP)/flat/Distribution
+# echo " my.result.title = 'Failure';" >> $(PKG_TMP)/flat/Distribution
+# echo " my.result.message = 'You need at least Mac OS X 10.5 to install stx.';" >> $(PKG_TMP)/flat/Distribution
+# echo " my.result.type = 'Fatal';" >> $(PKG_TMP)/flat/Distribution
+# echo " return false;" >> $(PKG_TMP)/flat/Distribution
+# echo " }" >> $(PKG_TMP)/flat/Distribution
+# echo " return true;" >> $(PKG_TMP)/flat/Distribution
+# echo " }" >> $(PKG_TMP)/flat/Distribution
+# echo " ]]></script>" >> $(PKG_TMP)/flat/Distribution
+# echo " <background file=\"background.png\" mime-type=\"image/png\" alignment=\"bottomleft\" scaling=\"none\"/>" >> $(PKG_TMP)/flat/Distribution
+# echo " <license file=\"COPYRIGHT\" mime-type=\"text/plain\"/>" >> $(PKG_TMP)/flat/Distribution
+# echo " <welcome file=\"README\" mime-type=\"text/plain\"/>" >> $(PKG_TMP)/flat/Distribution
+# echo " <choices-outline>" >> $(PKG_TMP)/flat/Distribution
+# echo " <line choice=\"choice1\"/>" >> $(PKG_TMP)/flat/Distribution
+# echo " </choices-outline>" >> $(PKG_TMP)/flat/Distribution
+# echo " <choice id=\"choice1\" title=\"base\">" >> $(PKG_TMP)/flat/Distribution
+# echo " <pkg-ref id=\"com.exept.stx.base.pkg\"/>" >> $(PKG_TMP)/flat/Distribution
+# echo " </choice>" >> $(PKG_TMP)/flat/Distribution
+# echo " <pkg-ref id=\"com.exept.stx.base.pkg\" installKBytes=\""`cat $(PKG_TMP)/diskUsage`"\" version=\"7.1.0\" auth=\"Root\">#base.pkg</pkg-ref>" >> $(PKG_TMP)/flat/Distribution
+# echo " </installer-script>" >> $(PKG_TMP)/flat/Distribution
+# rm $(PKG_TMP)/diskUsage $(PKG_TMP)/numFiles
+# ( cd $(PKG_TMP)/flat && xar --compression none -cf "/tmp/stx7.1.0Installer.pkg" * )
+
+#
+# installs stx base system in user's local Library folder
+#
+osx_localInstall:
+ $(MAKE) osx_install FRAMEWORK_DST=~/Library/Frameworks/SmalltalkX.framework
+
+#
+# installs stx base system in the system's Library folder
+#
+osx_systemInstall:
+ $(MAKE) osx_install FRAMEWORK_DST=/Library/Frameworks/SmalltalkX.framework
+
+#
+# installs stx base system in $(FRAMEWORK_DST) folder
+#
+osx_install:
+ $(MAKE) osx_installFramework
+ @echo "Installing Version "$(VSN)" in "$(FRAMEWORK_DST)
+ @-if [ ! -d $(FRAMEWORK_DST) ]; then \
+ mkdir $(FRAMEWORK_DST); \
+ fi
+ @-if [ ! -d $(FRAMEWORK_DST)/Versions ]; then \
+ mkdir $(FRAMEWORK_DST)/Versions; \
+ fi
+ cp -R tmp_framework/Versions/$(VSN) $(FRAMEWORK_DST)/Versions/
+ @-rm $(FRAMEWORK_DST)/Versions/Current
+ @-echo $(VSN) > /tmp/stx_vsn
+ @(cd $(FRAMEWORK_DST)/Versions; ln -s `cat /tmp/stx_vsn` Current)
+ @-rm /tmp/stx_vsn
+ @-rm -f $(FRAMEWORK_DST)/Headers
+ @(cd $(FRAMEWORK_DST); ln -s Versions/Current/Headers Headers)
+ @-rm -f $(FRAMEWORK_DST)/Sources
+ @(cd $(FRAMEWORK_DST); ln -s Versions/Current/Sources Sources)
+ @-rm -f $(FRAMEWORK_DST)/Documentation
+ @(cd $(FRAMEWORK_DST); ln -s Versions/Current/Documentation Documentation)
+ @-rm -f $(FRAMEWORK_DST)/Libraries
+ @(cd $(FRAMEWORK_DST); ln -s Versions/Current/Libraries Libraries)
+ @-rm -f $(FRAMEWORK_DST)/Resources
+ @(cd $(FRAMEWORK_DST); ln -s Versions/Current/Resources Resources)
+
+osx_installFramework:
+ @-rm -rf tmp_framework
+ @-mkdir tmp_framework
+ @-mkdir tmp_framework/Versions
+ @-mkdir tmp_framework/Versions/$(VSN)
+ @-mkdir tmp_framework/Versions/$(VSN)/Resources
+ @-mkdir tmp_framework/Versions/$(VSN)/Libraries
+ -cp *.so tmp_framework/Versions/$(VSN)/Libraries
+ -for i in $(OSX_LIBS); do \
+ if [ -d ../../$$i/resources ]; then \
+ mkdir tmp_framework/Versions/$(VSN)/Resources/$$i; \
+ cp ../../$$i/resources/*.rs tmp_framework/Versions/$(VSN)/Resources/$$i/; \
+ fi; \
+ done
+
+osx_installHeaders:
+ $(MAKE) osx_installFrameworkHeaders
+ @echo "Installing Headers for Version "$(VSN)" in "$(FRAMEWORK_DST)
+ @-if [ ! -d $(FRAMEWORK_DST) ]; then \
+ mkdir $(FRAMEWORK_DST); \
+ fi
+ @-if [ ! -d $(FRAMEWORK_DST)/Versions ]; then \
+ mkdir $(FRAMEWORK_DST)/Versions; \
+ fi
+ cp -R tmp_framework/Versions/$(VSN) $(FRAMEWORK_DST)/Versions/
+
+osx_installFrameworkHeaders:
+ @-rm -rf tmp_framework
+ @-mkdir tmp_framework
+ @-mkdir tmp_framework/Versions
+ @-mkdir tmp_framework/Versions/$(VSN)
+ @-mkdir tmp_framework/Versions/$(VSN)/Headers
+ -for i in $(OSX_LIBS); do \
+ mkdir tmp_framework/Versions/$(VSN)/Headers/$$i; \
+ cp ../../$$i/*.H tmp_framework/Versions/$(VSN)/Headers/$$i/; \
+ done
+
+osx_installSource:
+ $(MAKE) osx_installFrameworkSource
+ @echo "Installing Sources for Version "$(VSN)" in "$(FRAMEWORK_DST)
+ @-if [ ! -d $(FRAMEWORK_DST) ]; then \
+ mkdir $(FRAMEWORK_DST); \
+ fi
+ @-if [ ! -d $(FRAMEWORK_DST)/Versions ]; then \
+ mkdir $(FRAMEWORK_DST)/Versions; \
+ fi
+ cp -R tmp_framework/Versions/$(VSN) $(FRAMEWORK_DST)/Versions/
+
+osx_installFrameworkSource:
+ @-rm -rf tmp_framework
+ @-mkdir tmp_framework
+ @-mkdir tmp_framework/Versions
+ @-mkdir tmp_framework/Versions/$(VSN)
+ @-mkdir tmp_framework/Versions/$(VSN)/Sources
+ -for i in $(OSX_LIBS); do \
+ mkdir tmp_framework/Versions/$(VSN)/Sources/$$i; \
+ cp ../../$$i/*.st tmp_framework/Versions/$(VSN)/Sources/$$i/; \
+ done
+
+osx_installDocumentation:
+ $(MAKE) osx_installFrameworkDocumentation
+ @echo "Installing Documentation for Version "$(VSN)" in "$(FRAMEWORK_DST)
+ @-if [ ! -d $(FRAMEWORK_DST) ]; then \
+ mkdir $(FRAMEWORK_DST); \
+ fi
+ @-if [ ! -d $(FRAMEWORK_DST)/Versions ]; then \
+ mkdir $(FRAMEWORK_DST)/Versions; \
+ fi
+ cp -R tmp_framework/Versions/$(VSN) $(FRAMEWORK_DST)/Versions/
+
+osx_installFrameworkDocumentation:
+ @-rm -rf tmp_framework
+ @-mkdir tmp_framework
+ @-mkdir tmp_framework/Versions
+ @-mkdir tmp_framework/Versions/$(VSN)
+ @-mkdir tmp_framework/Versions/$(VSN)/Documentation
+ cp -R ../../doc/online "tmp_framework/Versions/$(VSN)/Documentation/"
+ @-find "tmp_framework/Versions/$(VSN)/Documentation/" -name ".cvsignore" -exec rm -f {} \;
+ @-find "tmp_framework/Versions/$(VSN)/Documentation/" -name "CVS" -exec rm -rf {} \;
+ @-find "tmp_framework/Versions/$(VSN)/Documentation/" -name "NO*AUTO*" -exec rm -f {} \;
+ @-find "tmp_framework/Versions/$(VSN)/Documentation/" -name "makefile" -exec rm -f {} \;
+ @-find "tmp_framework/Versions/$(VSN)/Documentation/" -name "Make.*" -exec rm -f {} \;
+
################### end of mac specific #################
################### begin of tgz specific #################
@@ -517,6 +740,9 @@
#FIND_PRINT=
cleanTemporaryDeploymentHierarchy:
+ @-if [ "$TMP_TOP" = "" ]; then \
+ exit 1; \
+ fi
$(MAKE) cleanMiscJunk TMP_TOP=$(TMP_TOP)
$(MAKE) cleanNeverDeliveredStuff TMP_TOP=$(TMP_TOP)
$(MAKE) cleanPackages TMP_TOP=$(TMP_TOP)
@@ -530,14 +756,27 @@
cleanStuffNotForArch_macosx:
$(MAKE) cleanWindowsSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanFreeBSDSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanLinuxSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanObsoleteArchitectureSpecific TMP_TOP=$(TMP_TOP)
cleanStuffNotForArch_linux:
$(MAKE) cleanMacOSXSpecific TMP_TOP=$(TMP_TOP)
$(MAKE) cleanWindowsSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanFreeBSDSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanObsoleteArchitectureSpecific TMP_TOP=$(TMP_TOP)
cleanStuffNotForArch_raspian:
$(MAKE) cleanMacOSXSpecific TMP_TOP=$(TMP_TOP)
$(MAKE) cleanWindowsSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanFreeBSDSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanObsoleteArchitectureSpecific TMP_TOP=$(TMP_TOP)
+
+cleanStuffNotForArch_win32:
+ $(MAKE) cleanMacOSXSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanFreeBSDSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanLinuxSpecific TMP_TOP=$(TMP_TOP)
+ $(MAKE) cleanObsoleteArchitectureSpecific TMP_TOP=$(TMP_TOP)
cleanWindowsSpecific:
find "$(TMP_TOP)"/stx -name "*.mak" $(FIND_PRINT) -exec rm -f {} \;
@@ -562,69 +801,79 @@
$(MAKE) cleanLinuxAoutOnElfSpecific TMP_TOP=$(TMP_TOP)
cleanLinuxAoutOnElfSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/linux_a.out_onELF
+ -rm -rf "$(TMP_TOP)"/stx/configurations/linux_a.out_onELF
+
+cleanLinuxSpecific:
+ -rm -rf "$(TMP_TOP)"/stx/configurations/linux
+ -rm -rf "$(TMP_TOP)"/stx/configurations/linux-*
+ -rm -rf "$(TMP_TOP)"/stx/support/autopackage.*
cleanFreeBSDSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/freeBSD
+ -rm -rf "$(TMP_TOP)"/stx/configurations/freeBSD
cleanSunSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/sun
+ -rm -rf "$(TMP_TOP)"/stx/configurations/sun
cleanSgiSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/sgi
+ -rm -rf "$(TMP_TOP)"/stx/configurations/sgi
cleanNeXTSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/NeXT
+ -rm -rf "$(TMP_TOP)"/stx/configurations/NeXT
cleanAixSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/aix
+ -rm -rf "$(TMP_TOP)"/stx/configurations/aix
cleanDecSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/dec
+ -rm -rf "$(TMP_TOP)"/stx/configurations/dec
cleanHpSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/hp
+ -rm -rf "$(TMP_TOP)"/stx/configurations/hp
cleanMotorolaSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/motorola
+ -rm -rf "$(TMP_TOP)"/stx/configurations/motorola
cleanQnxSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/qnx
+ -rm -rf "$(TMP_TOP)"/stx/configurations/qnx
cleanUnixwareSpecific:
- rm -rf "$(TMP_TOP)"/stx/configurations/unixware
+ -rm -rf "$(TMP_TOP)"/stx/configurations/unixware
#
# work in progress or not-yet-fully ported stuff
#
cleanUnfinished:
- rm -rf "$(TMP_TOP)"/stx/libobjc
- rm -rf "$(TMP_TOP)"/stx/libdb/nosql/ken
- rm -rf "$(TMP_TOP)"/stx/libdb/nosql/sedna
- rm -rf "$(TMP_TOP)"/stx/libdb/libopenDBX
- rm -rf "$(TMP_TOP)"/stx/goodies/roelTyper
- rm -rf "$(TMP_TOP)"/stx/goodies/raytracing
- rm -rf "$(TMP_TOP)"/stx/goodies/imageSegments
- rm -rf "$(TMP_TOP)"/stx/goodies/hotdraw
- rm -rf "$(TMP_TOP)"/stx/goodies/goods
- rm -rf "$(TMP_TOP)"/stx/goodies/gitocello
- rm -rf "$(TMP_TOP)"/stx/goodies/glorp0_4
- rm -rf "$(TMP_TOP)"/stx/goodies/constraints
- rm -rf "$(TMP_TOP)"/stx/goodies/cassovary
+ -rm -rf "$(TMP_TOP)"/stx/libobjc
+ -rm -rf "$(TMP_TOP)"/stx/libdb/nosql/ken
+ -rm -rf "$(TMP_TOP)"/stx/libdb/nosql/sedna
+ -rm -rf "$(TMP_TOP)"/stx/libdb/libopenDBX
+ -rm -rf "$(TMP_TOP)"/stx/goodies/roelTyper
+ -rm -rf "$(TMP_TOP)"/stx/goodies/raytracing
+ -rm -rf "$(TMP_TOP)"/stx/goodies/imageSegments
+ -rm -rf "$(TMP_TOP)"/stx/goodies/hotdraw
+ -rm -rf "$(TMP_TOP)"/stx/goodies/goods
+ -rm -rf "$(TMP_TOP)"/stx/goodies/gitocello
+ -rm -rf "$(TMP_TOP)"/stx/goodies/glorp0_4
+ -rm -rf "$(TMP_TOP)"/stx/goodies/constraints
+ -rm -rf "$(TMP_TOP)"/stx/goodies/cassovary
-find "$(TMP_TOP)"/stx -name "not_ported" $(FIND_PRINT) -exec rm -rf {} \;
#
# baby baby baby you're out of tiiiime...
#
cleanObsoleteStuff:
- rm -rf "$(TMP_TOP)"/stx/librt
- rm -rf "$(TMP_TOP)"/stx/libsnmp
- rm -rf "$(TMP_TOP)"/stx/goodies/stx
- rm -rf "$(TMP_TOP)"/stx/liboracle8
- rm -rf "$(TMP_TOP)"/stx/support/DLD
- rm -rf "$(TMP_TOP)"/stx/support/unixware
- rm -rf "$(TMP_TOP)"/stx/support/db
- rm -rf "$(TMP_TOP)"/stx/projects/drawtool
+ -rm -rf "$(TMP_TOP)"/stx/librt
+ -rm -rf "$(TMP_TOP)"/stx/libsnmp
+ -rm -rf "$(TMP_TOP)"/stx/goodies/stx
+ -rm -rf "$(TMP_TOP)"/stx/clients/AddrBook
+ -rm -rf "$(TMP_TOP)"/stx/clients/DirView
+ -rm -rf "$(TMP_TOP)"/stx/clients/DocTool
+ -rm -rf "$(TMP_TOP)"/stx/clients/MailTool
+ -rm -rf "$(TMP_TOP)"/stx/clients/NewsTool
+ -rm -rf "$(TMP_TOP)"/stx/liboracle8
+ -rm -rf "$(TMP_TOP)"/stx/support/DLD
+ -rm -rf "$(TMP_TOP)"/stx/support/unixware
+ -rm -rf "$(TMP_TOP)"/stx/support/db
+ -rm -rf "$(TMP_TOP)"/stx/projects/drawtool
-find "$(TMP_TOP)"/stx -name "obsolete" $(FIND_PRINT) -exec rm -rf {} \;
-find "$(TMP_TOP)"/stx -name "obsolete_*" $(FIND_PRINT) -exec rm -rf {} \;
-find "$(TMP_TOP)"/stx -name "*_old" $(FIND_PRINT) -exec rm -rf {} \;
@@ -635,10 +884,16 @@
# stuff noone needs outside expet
#
cleanMiscJunk:
- rm -f "$(TMP_TOP)"/stx/Dockerfile
- rm -f "$(TMP_TOP)"/stx/Install.files
- rm -f "$(TMP_TOP)"/stx/update.sh
- rm -f "$(TMP_TOP)"/stx/TAGS
+ -rm -f "$(TMP_TOP)"/stx/Dockerfile
+ -rm -f "$(TMP_TOP)"/stx/Install.files
+ -rm -f "$(TMP_TOP)"/stx/update.sh
+ -rm -f "$(TMP_TOP)"/stx/TAGS
+ -rm -f "$(TMP_TOP)"/stx/goodies/*.zip
+ -rm -f "$(TMP_TOP)"/stx/mkisofs.exclude
+ -rm -rf "$(TMP_TOP)"/stx/support/des
+ -rm -rf "$(TMP_TOP)"/stx/support/ctags-3*
+ -rm -rf "$(TMP_TOP)"/stx/support/libjpeg-6*
+ -rm -f "$(TMP_TOP)"/stx/support/mk-selfinstall
#
# stuff we keep secret - that's live
@@ -660,32 +915,32 @@
rm -rf "$(TMP_TOP)"/stx/librun/ieee754_support
rm -rf "$(TMP_TOP)"/stx/librun/libffi*
rm -rf "$(TMP_TOP)"/stx/librun/genDate*
- rm -rf "$(TMP_TOP)"/stx/librun/*.bpr
- rm -rf "$(TMP_TOP)"/stx/librun/*.BPR
- rm -rf "$(TMP_TOP)"/stx/librun/*.cpp
- rm -rf "$(TMP_TOP)"/stx/librun/*.dbg
- rm -rf "$(TMP_TOP)"/stx/librun/*.gdb
- rm -rf "$(TMP_TOP)"/stx/librun/*.s
- rm -rf "$(TMP_TOP)"/stx/librun/*.asm
- rm -rf "$(TMP_TOP)"/stx/librun/*.sln
- rm -rf "$(TMP_TOP)"/stx/librun/*.def
- rm -rf "$(TMP_TOP)"/stx/librun/*.exp
- rm -rf "$(TMP_TOP)"/stx/librun/*.rc
- rm -rf "$(TMP_TOP)"/stx/librun/*.vcproj
- rm -rf "$(TMP_TOP)"/stx/librun/*.vcExpress
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.bpr
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.BPR
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.cpp
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.dbg
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.gdb
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.s
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.asm
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.sln
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.def
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.exp
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.rc
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.vcproj
+ -rm -rf "$(TMP_TOP)"/stx/librun/*.vcExpress
rm -f "$(TMP_TOP)"/stx/stc/*.c
rm -f "$(TMP_TOP)"/stx/stc/*.y
rm -f "$(TMP_TOP)"/stx/stc/*.l
- rm -f "$(TMP_TOP)"/stx/stc/*.bpr
- rm -f "$(TMP_TOP)"/stx/stc/*.BPR
+ -rm -f "$(TMP_TOP)"/stx/stc/*.bpr
+ -rm -f "$(TMP_TOP)"/stx/stc/*.BPR
rm -f "$(TMP_TOP)"/stx/stc/global.h
rm -f "$(TMP_TOP)"/stx/stc/nttokens.h
rm -f "$(TMP_TOP)"/stx/stc/tokens.h
rm -f "$(TMP_TOP)"/stx/stc/sha1.h
- rm -f "$(TMP_TOP)"/stx/stc/*.cpp
- rm -f "$(TMP_TOP)"/stx/stc/*.sln
- rm -f "$(TMP_TOP)"/stx/stc/*.vcproj
- rm -f "$(TMP_TOP)"/stx/stc/*.depend
+ -rm -f "$(TMP_TOP)"/stx/stc/*.cpp
+ -rm -f "$(TMP_TOP)"/stx/stc/*.sln
+ -rm -f "$(TMP_TOP)"/stx/stc/*.vcproj
+ -rm -f "$(TMP_TOP)"/stx/stc/*.depend
rm -f "$(TMP_TOP)"/stx/stc/defs.h
rm -rf "$(TMP_TOP)"/stx/stc/bin
rm -rf "$(TMP_TOP)"/stx/stc/obj
@@ -696,76 +951,86 @@
cleanPackages:
# (cd "$(TMP_TOP)"/stx ; make cleanjunk)
(cd "$(TMP_TOP)"/stx/stc/tests ; make clobber)
- rm -rf "$(TMP_TOP)"/stx/libjava.both
- rm -rf "$(TMP_TOP)"/stx/libjava.cvs
- rm -rf "$(TMP_TOP)"/stx/libjava.old
- rm -rf "$(TMP_TOP)"/stx/librun-*
- rm -rf "$(TMP_TOP)"/stx/librun_*
- rm -rf "$(TMP_TOP)"/stx/librun.*
- rm -rf "$(TMP_TOP)"/stx/stc/*.dSYM
- rm -rf "$(TMP_TOP)"/stx/stc/*/*.dSYM
- rm -rf "$(TMP_TOP)"/stx/stc/libfl
- rm -rf "$(TMP_TOP)"/stx/stc/tests/test[0-9]*
- rm -rf "$(TMP_TOP)"/stx/stc/tests/hw
- rm -rf "$(TMP_TOP)"/stx/stc/tests
- rm -rf "$(TMP_TOP)"/stx/libscm.cvs
- rm -rf "$(TMP_TOP)"/stx/libscm.hg
- rm -f "$(TMP_TOP)"/stx/libbasic*/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/libboss/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/libcomp/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/libview*/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/libwidg*/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/libtool*/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/libui/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/libdb/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/libdb/*/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/libopengl/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/goodies/chronos/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/goodies/chronos/*/[A-Z]*.c
- rm -f "$(TMP_TOP)"/stx/goodies/*/i_[A-Z]*.c
- rm -rf "$(TMP_TOP)"/stx/monticello_packages
- rm -rf "$(TMP_TOP)"/stx/support/tools/splint-*
- rm -rf "$(TMP_TOP)"/stx/support/tools/cscope-*
- rm -rf "$(TMP_TOP)"/stx/support/xft
- rm -rf "$(TMP_TOP)"/stx/support/libjpeg
- rm -rf "$(TMP_TOP)"/stx/support/libjpeg-7
- rm -rf "$(TMP_TOP)"/stx/projects/tinytalk
- rm -rf "$(TMP_TOP)"/stx/projects/minitalk
- rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/package-cache
- rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/modules
- rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/stcTests
- rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/crashdumps
- rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/examples
- rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/expeccoPatches
- rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/.SandstoneDb
- rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/changes_*
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/[A-Z]*.st
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/old_settings.stx
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.txt
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.uprj
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.js
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/evo*.wsp
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.html
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.log
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.png
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/data
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/out
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/err
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/outfile
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/ss
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/stbc.rc
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.bos
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.swf
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.sln
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.vcproj
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.vcxproj
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.tgz
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.dmg
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*_dmg
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*_tgz
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/X
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/ZZ
- rm -f "$(TMP_TOP)"/stx/projects/smalltalk/test*
+ -rm -rf "$(TMP_TOP)"/stx/libjava.both
+ -rm -rf "$(TMP_TOP)"/stx/libjava.cvs
+ -rm -rf "$(TMP_TOP)"/stx/libjava.old
+ -rm -rf "$(TMP_TOP)"/stx/librun-*
+ -rm -rf "$(TMP_TOP)"/stx/librun_*
+ -rm -rf "$(TMP_TOP)"/stx/librun.*
+ -rm -rf "$(TMP_TOP)"/stx/stc/*.dSYM
+ -rm -rf "$(TMP_TOP)"/stx/stc/*/*.dSYM
+ -rm -rf "$(TMP_TOP)"/stx/stc/libfl
+ -rm -rf "$(TMP_TOP)"/stx/stc/tests/test[0-9]*
+ -rm -rf "$(TMP_TOP)"/stx/stc/tests/hw
+ -rm -rf "$(TMP_TOP)"/stx/stc/tests
+ -rm -rf "$(TMP_TOP)"/stx/libscm.cvs
+ -rm -rf "$(TMP_TOP)"/stx/libscm.hg
+ -rm -f "$(TMP_TOP)"/stx/libbasic*/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/libboss/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/libcomp/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/libview*/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/libwidg*/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/libtool*/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/libui/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/libdb/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/libdb/*/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/libopengl/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/goodies/chronos/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/goodies/chronos/*/[A-Z]*.c
+ -rm -f "$(TMP_TOP)"/stx/goodies/*/i_[A-Z]*.c
+ -rm -rf "$(TMP_TOP)"/stx/monticello_packages
+ -rm -rf "$(TMP_TOP)"/stx/support/tools/splint-*
+ -rm -rf "$(TMP_TOP)"/stx/support/tools/cscope-*
+ -rm -rf "$(TMP_TOP)"/stx/support/xft
+ -rm -rf "$(TMP_TOP)"/stx/support/libjpeg
+ -rm -rf "$(TMP_TOP)"/stx/support/libjpeg-7
+ -rm -rf "$(TMP_TOP)"/stx/projects/tinytalk
+ -rm -rf "$(TMP_TOP)"/stx/projects/minitalk
+ -rm -rf "$(TMP_TOP)"/stx/projects/demoServer
+ -rm -rf "$(TMP_TOP)"/stx/projects/fileBrowser
+ -rm -rf "$(TMP_TOP)"/stx/projects/simpleFileBrowser
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/package-cache
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/modules
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/stcTests
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/crashdumps
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/examples
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/expeccoPatches
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/.SandstoneDb
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/changes_*
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/[A-Z]*.st
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/old_settings.stx
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.txt
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.uprj
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.js
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/evo*.wsp
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.html
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.log
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.png
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/data
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/out
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/err
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/outfile
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/ss
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/stbc.rc
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.bos
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.swf
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.sln
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.vcproj
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.vcxproj
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.tgz
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.dmg
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*_dmg
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*_tgz
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/X
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/ZZ
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/test*
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.extracted*
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.pkg*
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/*_pkg*
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/*_dmg*
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.jnk*
+ -rm -rf "$(TMP_TOP)"/stx/projects/smalltalk/tmp*
+ -rm -f "$(TMP_TOP)"/stx/projects/smalltalk/*.manifest
find "$(TMP_TOP)"/stx/projects -name "*.mcz" $(FIND_PRINT) -exec rm -f {} \;
find "$(TMP_TOP)"/stx/projects -name "*.sav" $(FIND_PRINT) -exec rm -f {} \;
find "$(TMP_TOP)"/stx/projects -name "*.img" $(FIND_PRINT) -exec rm -f {} \;
--- a/PackageLoading.wsp Sun Sep 04 20:30:44 2016 +0100
+++ b/PackageLoading.wsp Thu Nov 24 22:00:02 2016 +0000
@@ -1,8 +1,8 @@
"/ Packages you may want to load:
"/ ==============================
-Please see also the "Load Package" menu item in the Launcher's file menu.
-
+"/ Please see also the "Load Package" menu item in the Launcher's file menu.
+"/ You can also specify a list of autoloaded packages in the settings dialog.
"/ Programmer Tools:
"/ -----------------
--- a/Welcome.wsp Sun Sep 04 20:30:44 2016 +0100
+++ b/Welcome.wsp Thu Nov 24 22:00:02 2016 +0000
@@ -1,10 +1,18 @@
Hello World !
=============
-Welcome to the 6.x ST/X release.
+Welcome to the 7.x ST/X release.
Please refer to the online documentation
("What's new in ST/X" and "What's new in the Documentation") for detais.
+What's new in 7.1 ?
+ some incompatible class changes make old binary class libraries incompatible;
+ therefore a major version number change.
+ again, many tool improvements.
+ OS X support (64bit)
+ 64bit support for windows and linux
+ better packaging and stand alone compilation tools
+
What's new in 6.2.5 ?
many tool improvements.
much better macosx view style
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deploySupport/README Thu Nov 24 22:00:02 2016 +0000
@@ -0,0 +1,6 @@
+osx_Info.plist:
+ needed for the stx.dmg (IDE APP package)
+
+osx_Distribution:
+ needed for the stx.pkg (runtime package for standalone programs)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deploySupport/osx_Distribution Thu Nov 24 22:00:02 2016 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<installer-gui-script minSpecVersion="1">
+ <title>Smalltalk/X</title>
+ <background file="background.png" mime-type="image/png" />
+ <welcome file="LICENCE_FREE_STX.html" mime-type="text/html"/>
+ <options customize="always" require-scripts="false"/>
+ <pkg-ref id="stx.base">
+ <bundle-version/>
+ </pkg-ref>
+ <pkg-ref id="stx.base.headers">
+ <bundle-version/>
+ </pkg-ref>
+ <pkg-ref id="stx.base.source">
+ <bundle-version/>
+ </pkg-ref>
+ <pkg-ref id="stx.base.documentation">
+ <bundle-version/>
+ </pkg-ref>
+ <choices-outline>
+ <line choice="stx.base"/>
+ <line choice="stx.base.headers"/>
+ <line choice="stx.base.source"/>
+ <line choice="stx.base.documentation"/>
+ </choices-outline>
+
+ <choice title="Runtime Files" tooltip="Runtime Libraries" id="stx.base" description="Runtime libraries for standalone programs. Contains shared libraries which are needed by deployed stand-alone programs which are not deployed as bundled Apps">
+ <pkg-ref id="stx.base"/>
+ </choice>
+ <pkg-ref id="stx.base" version="7.1.0" onConclusion="none" installKBytes="83473">#SmalltalkX_Runtime_7.1.0.pkg</pkg-ref>
+
+ <choice title="Header Files" tooltip="Toggle to include/exclude header files" id="stx.base.headers" description="Header files. Required for development (i.e. to compile stand-alone programs)">
+ <pkg-ref id="stx.base.headers"/>
+ </choice>
+ <pkg-ref id="stx.base.headers" version="7.1.0" onConclusion="none" installKBytes="84493">#SmalltalkX_Headers_7.1.0.pkg</pkg-ref>
+
+ <choice title="Sources" tooltip="Toggle to include/exclude source code" id="stx.base.source" description="Smalltalk sources. If installed, the debugger can show more information">
+ <pkg-ref id="stx.base.source"/>
+ </choice>
+ <pkg-ref id="stx.base.source" version="7.1.0" onConclusion="none" installKBytes="132400">#SmalltalkX_Source_7.1.0.pkg</pkg-ref>
+
+ <choice title="Documentation" tooltip="Toggle to include/exclude the online documentation" id="stx.base.documentation" description="Online documentation">
+ <pkg-ref id="stx.base.documentation"/>
+ </choice>
+ <pkg-ref id="stx.base.documentation" version="7.1.0" onConclusion="none" installKBytes="144111">#SmalltalkX_Documentation_7.1.0.pkg</pkg-ref>
+</installer-gui-script>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deploySupport/osx_Info.plist Thu Nov 24 22:00:02 2016 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+
+ <key>CFBundleIdentifier</key>
+ <string>com.smalltalkX</string>
+
+ <key>CFBundleName</key>
+ <string>SmalltalkX</string>
+
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+
+ <key>CFBundleExecutable</key>
+ <string>stx</string>
+
+<!-- <key>CFBundleIconFile</key>
+ <string>wxmac.icns</string>
+-->
+ <key>CFBundlePackageType</key>
+ <string>APPLstx</string>
+
+ <key>CFBundleShortVersionString</key>
+ <string>7.1.0.0</string>
+
+ <key>CFBundleVersion</key>
+ <string>7.1.0.0</string>
+
+ <key>LSMinimumSystemVersion</key>
+ <string>10.5.0</string>
+
+</dict>
+</plist>
--- a/keyboard.rc Sun Sep 04 20:30:44 2016 +0100
+++ b/keyboard.rc Thu Nov 24 22:00:02 2016 +0000
@@ -46,6 +46,7 @@
#(
#Cmd #Alt
#Cmd #Menu
+"/ #Cmd #Mode_switch
#Menu #Appl
#Menu #CtrlAppl
#Menu #CmdAppl
@@ -153,10 +154,13 @@
#SelectToEnd #CtrlE "that is ctrl-shift-e"
#SelectFromBeginning #CtrlA "that is ctrl-shift-a"
#ExpandSelectionByLine #Cmdl "try multiple Cmd-l's ..."
- #ExpandSelectionByWord #CmdW "try multiple Cmd-shift-w's ..."
+ #ExpandSelectionByWord #CmdW "try multiple Cmd-w's ..."
+"/ #ExpandSelectionByWord #CtrlW "that is ctrl-shift-w"
- #ZoomIn #'Ctrl+'
+ #ZoomIn #'Ctrl+'
#ZoomOut #'Ctrl-'
+ #ZoomInAll #'Ctrl*'
+ #ZoomOutAll #'Ctrlunderscore'
"Notice:
Cmd-CursorLeft/Right and Alt-CursorLeft/Right
@@ -456,24 +460,33 @@
"/ xlate characters .... on others, it does and you may remove/comment
"/ the following.)
"/
-map bindValue:$[ to:#'Alt['.
-map bindValue:$] to:#'Alt]'.
-map bindValue:$| to:#'Alt|'.
-map bindValue:${ to:#'Alt{'.
-map bindValue:$} to:#'Alt}'.
-map bindValue:$\ to:#'Alt\'.
-map bindValue:$~ to:#'Alt~'.
-map bindValue:$@ to:#'Alt@'.
+OperatingSystem isOSXlike ifFalse:[
+"/ map bindValue:$ to:#'Alt0'.
+"/ map bindValue:$ to:#'Alt1'.
+"/ map bindValue:$ to:#'Alt2'.
+"/ map bindValue:$ to:#'Alt3'.
+"/ map bindValue:$ to:#'Alt+'.
+"/ map bindValue:$ to:#'Altd'. "/ degrees
-map bindValue:$[ to:#'Cmd['.
-map bindValue:$] to:#'Cmd]'.
-map bindValue:$| to:#'Cmd|'.
-map bindValue:${ to:#'Cmd{'.
-map bindValue:$} to:#'Cmd}'.
-map bindValue:$\ to:#'Cmd\'.
-map bindValue:$~ to:#'Cmd~'.
-map bindValue:$@ to:#'Cmd@'.
-map bindValue:$# to:#'Cmd#'.
+ map bindValue:$[ to:#'Alt['.
+ map bindValue:$] to:#'Alt]'.
+ map bindValue:$| to:#'Alt|'.
+ map bindValue:${ to:#'Alt{'.
+ map bindValue:$} to:#'Alt}'.
+ map bindValue:$\ to:#'Alt\'.
+ map bindValue:$~ to:#'Alt~'.
+ map bindValue:$@ to:#'Alt@'.
+
+ map bindValue:$[ to:#'Cmd['.
+ map bindValue:$] to:#'Cmd]'.
+ map bindValue:$| to:#'Cmd|'.
+ map bindValue:${ to:#'Cmd{'.
+ map bindValue:$} to:#'Cmd}'.
+ map bindValue:$\ to:#'Cmd\'.
+ map bindValue:$~ to:#'Cmd~'.
+ map bindValue:$@ to:#'Cmd@'.
+ map bindValue:$# to:#'Cmd#'.
+].
map bindValue:#UserInterrupt to:#'Cmd.' . "/ for squeak compatibility
map bindValue:#UserInterrupt to:#'Ctrl.' . "/ for vw compatibility
--- a/patches Sun Sep 04 20:30:44 2016 +0100
+++ b/patches Thu Nov 24 22:00:02 2016 +0000
@@ -15,8 +15,6 @@
p package:#'patches'.
Project current:p.
].
-
-Smalltalk splashInfo:'patches [info]: installing patches...'.
!
"/ read patches from two patch-directories, called 'stxPatches' and 'userPatches'.
@@ -26,6 +24,8 @@
"/ Patches from that directory are read in alphabetic order;
"/ patches will be named them p_nnnn.st, where nnnn is a sequence-nr.
+"/ Smalltalk splashInfo:'patches [info]: installing patches...'.
+
#(
'stxPatches'
'userPatches'
@@ -44,11 +44,15 @@
crashes during startup, if one of the patch directories contains another directory
(such as CVS)"
(file isDirectory not and:[file isReadable]) ifTrue:[
- Smalltalk splashInfo:('patches [info]: reading patchFile "' , fn , '"...').
- AbortOperationRequest handle:[:ex |
- Smalltalk splashInfo:('patches [info]: aborted patch "',f,'" (',ex description,')').
- ] do:[
- Smalltalk fileIn:fn.
+ ( #('xxx' 'bak' 'sav') includes:file suffix asLowercase) ifTrue:[
+ Smalltalk splashInfo:('patches [info]: skipping file "',fn,'" (wrong suffix)').
+ ] ifFalse:[
+ Smalltalk splashInfo:('patches [info]: reading patch "',fn,'"...').
+ AbortOperationRequest handle:[:ex |
+ Smalltalk splashInfo:('patches [info]: aborted patch "',f,'" (',ex description,')').
+ ] do:[
+ Smalltalk fileIn:fn.
+ ].
].
]
]
--- a/script1.stx Sun Sep 04 20:30:44 2016 +0100
+++ b/script1.stx Thu Nov 24 22:00:02 2016 +0000
@@ -12,7 +12,7 @@
"/ ensure that stx is in your path,
"/ then type ./script1.stx
"/
-"/ just prints some numbers
+"/ will just print some numbers
"/
1 to:10 do:[:i |
('the factorial of %1 is %2'
--- a/script2.stx Sun Sep 04 20:30:44 2016 +0100
+++ b/script2.stx Thu Nov 24 22:00:02 2016 +0000
@@ -5,20 +5,3 @@
"/
Workspace open.
'done' printCR.
-
-"
-[
- Delay waitForSeconds:10.
- Process allInstances do:[:p |
- p isDead ifFalse:[
- p name print. ' ' print. p isSystemProcess printCR.
-p suspendedContext notNil ifTrue:[
- p suspendedContext fullPrintAll.
- '' printCR.
-].
- ].
- ].
- Processor anyUserProcessAtAll printCR.
- Smalltalk exit
-] fork.
-"
--- a/smalltalk.rc Sun Sep 04 20:30:44 2016 +0100
+++ b/smalltalk.rc Thu Nov 24 22:00:02 2016 +0000
@@ -279,11 +279,14 @@
needToReactivate := false
].
- ((Smalltalk commandLineArguments includes:'--quick')
- or:[ (Smalltalk isPlugin)
- or:[ (Smalltalk commandLineArguments includes:'--faststart')
- or:[ (Smalltalk commandLineArguments includes:'--fastStart')
- ]]]) ifFalse:[
+"/ ((Smalltalk commandLineArguments includes:'--quick')
+"/ or:[ (Smalltalk isPlugin)
+"/ or:[ (Smalltalk commandLineArguments includes:'--faststart')
+"/ or:[ (Smalltalk commandLineArguments includes:'--fastStart')
+"/ ]]]) ifFalse:
+ (Smalltalk commandLineArguments includes:'--autoload')
+ ifTrue:
+ [
'smalltalk.rc [info]: installing autoloaded classes...' infoPrintCR.
Smalltalk installAutoloadedClasses.
].
@@ -816,7 +819,7 @@
(UserPreferences current autoloadedPackages) do:[:eachPackage |
Smalltalk showSplashMessage:('Autoloading ',eachPackage,'...').
Error handle:[:ex |
- ('smalltalk.rc [error]: error while autooading package: ',eachPackage) errorPrintCR.
+ ('smalltalk.rc [error]: error while autoloading package: ',eachPackage) errorPrintCR.
] do:[
Smalltalk loadPackage:eachPackage.
]
--- a/stx_projects_smalltalk.st Sun Sep 04 20:30:44 2016 +0100
+++ b/stx_projects_smalltalk.st Thu Nov 24 22:00:02 2016 +0000
@@ -1,5 +1,5 @@
"
- COPYRIGHT (c) 2006 by eXept Software AG
+ COPYRIGHT (c) Claus Gittinger / 2006 by eXept Software AG
2016-now by Jan Vrany <jan.vrany@fit.cvut.cz>
All Rights Reserved
@@ -25,7 +25,7 @@
copyright
"
- COPYRIGHT (c) 2006 by eXept Software AG
+ COPYRIGHT (c) Claus Gittinger / 2006 by eXept Software AG
2016-now by Jan Vrany <jan.vrany@fit.cvut.cz>
All Rights Reserved
@@ -232,7 +232,9 @@
companyName
"Return a companyname which will appear in <lib>.rc"
- ^ 'eXept Software AG'
+ ^ 'Claus Gittinger / eXept Software AG'
+
+ "Modified: / 18-11-2016 / 11:47:40 / cg"
!
description
@@ -246,9 +248,9 @@
legalCopyright
"Return a copyright string which will appear in <lib>.rc"
- ^ 'Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012'
+ ^ 'Copyright Claus Gittinger 1988\nCopyright eXept Software AG 1998-2012'
- "Modified: / 18-07-2012 / 19:12:22 / cg"
+ "Modified: / 18-11-2016 / 12:19:34 / cg"
!
productFilename
--- a/stxapp.rc Sun Sep 04 20:30:44 2016 +0100
+++ b/stxapp.rc Thu Nov 24 22:00:02 2016 +0000
@@ -17,10 +17,10 @@
Screen openDefaultDisplay:nil.
] on:Screen deviceOpenErrorSignal do:[:ex|
('smalltalk.rc [warning]: No Display connection to: ', ex parameter) errorPrintCR.
-]
+].
Display notNil ifTrue:[
- Smalltalk fileIn:'display.rc'
- Smalltalk fileIn:'keyboard.rc'
+ Smalltalk fileIn:'display.rc'.
+ Smalltalk fileIn:'keyboard.rc'.
].
Smalltalk silentLoading:true.
!