From 01cfa6f4b8c91df7f2bb29ff392efe94240da43e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 10 Feb 2013 21:21:43 +0100 Subject: [PATCH] pharo: Work on the automatic fileout to pharo Remove the PackageLoader fileInPackage statement as it is conflicting with the export as there is no PackageLoader in Pharo. Add a Makefile to help with invoking the export and create a compat_for_pharo.st for the methods not provided by Pharo. The testcase is working now. --- LogArea.st | 2 -- Makefile | 17 +++++++++++++++++ compat_for_pharo.st | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 Makefile create mode 100644 compat_for_pharo.st diff --git a/LogArea.st b/LogArea.st index 438c1d3..f4702fc 100644 --- a/LogArea.st +++ b/LogArea.st @@ -16,8 +16,6 @@ along with this program. If not, see . " -PackageLoader fileInPackage: #OsmoLogging. - Osmo.LogArea subclass: LogAreaTimer [ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c851331 --- /dev/null +++ b/Makefile @@ -0,0 +1,17 @@ + +GST_PACKAGE = gst-package +GST_CONVERT = gst-convert + +CONVERT_RULES = -r'Osmo.LogManager->LogManager' \ + -r'Osmo.LogArea->LogArea' \ + -r'Osmo.LogLevel->LogLevel' \ + -r'DateTime->DateAndTime' \ + -r'(Duration milliseconds: ``@args1) -> (Duration milliSeconds: ``@args1)' + + +all: + $(GST_PACKAGE) --test package.xml + +convert: + $(GST_CONVERT) $(CONVERT_RULES) -F squeak -f gst \ + -o fileout.st compat_for_pharo.st LogArea.st Dispatcher.st Timer.st Tests.st diff --git a/compat_for_pharo.st b/compat_for_pharo.st new file mode 100644 index 0000000..041a65c --- /dev/null +++ b/compat_for_pharo.st @@ -0,0 +1,16 @@ +"This is to be easily loadable on Pharo 1.4 and up" + +Object extend [ + addToBeFinalized [ + + "No idea how to implement it" + ] +] + +Semaphore extend [ + signals [ + + "Used in our testcase" + ^ excessSignals + ] +]