Mercurial Mercurial > hg > jv-calipel / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed --script paramter (alias for --arguments)
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 30 Sep 2014 10:06:32 +0100
changeset 223 72287b3d9937
parent 222 c98af04e13ce
child 224 703461d83b2f
Removed --script paramter (alias for --arguments) Recent version of Smalltalk/X handles --script itself si it is not passed to the client script (sigh)
s/BenchmarkRunner.st file | annotate | diff | comparison | revisions
s/Make.proto file | annotate | diff | comparison | revisions
s/bc.mak file | annotate | diff | comparison | revisions
s/s.rc file | annotate | diff | comparison | revisions
s/stx/BenchmarkRunnerAdapterStX.st file | annotate | diff | comparison | revisions
s/stx/stx.rc file | annotate | diff | comparison | revisions
s/tests/Make.proto file | annotate | diff | comparison | revisions
s/tests/bc.mak file | annotate | diff | comparison | revisions
s/tests/tests.rc file | annotate | diff | comparison | revisions 
--- a/s/BenchmarkRunner.st	Sun Sep 28 23:19:44 2014 +0100
+++ b/s/BenchmarkRunner.st	Tue Sep 30 10:06:32 2014 +0100
@@ -243,7 +243,6 @@
   -o FILE ................ write output to FILE instead of to standard output (default: stdout)
   -n RUNS ................ how many times to run each bechmark (default: 5)
   -r REPORTCLASS ......... user REPORTCLASS to generate report (default: BenchmarkReportText)
-  --script FILE 
   --arguments FILE ....... read additional arguments from FILE
   --setup EXPR ........... evaluate EXPR before actually running any benchmark
   --setup-script FILE .... evaluate code in FILE before actually running any benchmark
@@ -264,7 +263,7 @@
 '
 
     "Created: / 06-06-2013 / 11:01:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 08-03-2014 / 16:15:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 30-09-2014 / 09:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !BenchmarkRunner methodsFor:'private-parsing'!
--- a/s/Make.proto	Sun Sep 28 23:19:44 2014 +0100
+++ b/s/Make.proto	Tue Sep 30 10:06:32 2014 +0100
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libcompat
 
 
 # if you need any additional defines for embedded C code,
--- a/s/bc.mak	Sun Sep 28 23:19:44 2014 +0100
+++ b/s/bc.mak	Tue Sep 30 10:06:32 2014 +0100
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libcompat
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
--- a/s/s.rc	Sun Sep 28 23:19:44 2014 +0100
+++ b/s/s.rc	Tue Sep 30 10:06:32 2014 +0100
@@ -4,7 +4,7 @@
 //
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION     6,2,32767,32767
-  PRODUCTVERSION  6,2,3,0
+  PRODUCTVERSION  6,2,4,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
   FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -24,8 +24,8 @@
       VALUE "InternalName", "jv:calipel/s\0"
       VALUE "LegalCopyright", "My CopyRight or CopyLeft\0"
       VALUE "ProductName", "LibraryName\0"
-      VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Wed, 21 May 2014 10:01:24 GMT\0"
+      VALUE "ProductVersion", "6.2.4.0\0"
+      VALUE "ProductDate", "Tue, 30 Sep 2014 09:05:07 GMT\0"
     END
 
   END
--- a/s/stx/BenchmarkRunnerAdapterStX.st	Sun Sep 28 23:19:44 2014 +0100
+++ b/s/stx/BenchmarkRunnerAdapterStX.st	Tue Sep 30 10:06:32 2014 +0100
@@ -270,7 +270,7 @@
                 argv removeIndex: i.
                 i := i - 1.
             ]. 
-            (arg = '--arguments' or:[arg = '--script']) ifTrue:[
+            (arg = '--arguments') ifTrue:[
                 | arguments argumentsF parsed |
 
                 i > argv size ifTrue:[
@@ -321,7 +321,7 @@
     Smalltalk exit: 0.
 
     "Created: / 06-06-2013 / 10:07:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 24-09-2014 / 20:12:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 30-09-2014 / 09:58:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !BenchmarkRunnerAdapterStX class methodsFor:'documentation'!
--- a/s/stx/stx.rc	Sun Sep 28 23:19:44 2014 +0100
+++ b/s/stx/stx.rc	Tue Sep 30 10:06:32 2014 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "My CopyRight or CopyLeft\0"
       VALUE "ProductName", "ProductName\0"
       VALUE "ProductVersion", "6.2.4.0\0"
-      VALUE "ProductDate", "Wed, 24 Sep 2014 19:12:24 GMT\0"
+      VALUE "ProductDate", "Tue, 30 Sep 2014 09:05:10 GMT\0"
     END
 
   END
--- a/s/tests/Make.proto	Sun Sep 28 23:19:44 2014 +0100
+++ b/s/tests/Make.proto	Tue Sep 30 10:06:32 2014 +0100
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/calipel/s -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic
 
 
 # if you need any additional defines for embedded C code,
@@ -103,6 +103,7 @@
 prereq:
 	cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/s/tests/bc.mak	Sun Sep 28 23:19:44 2014 +0100
+++ b/s/tests/bc.mak	Tue Sep 30 10:06:32 2014 +0100
@@ -34,7 +34,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)\jv\calipel\s -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -52,6 +52,7 @@
 prereq:
 	pushd ..\..\..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
--- a/s/tests/tests.rc	Sun Sep 28 23:19:44 2014 +0100
+++ b/s/tests/tests.rc	Tue Sep 30 10:06:32 2014 +0100
@@ -4,7 +4,7 @@
 //
 VS_VERSION_INFO VERSIONINFO
   FILEVERSION     6,2,32767,32767
-  PRODUCTVERSION  6,2,3,0
+  PRODUCTVERSION  6,2,4,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
   FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -24,8 +24,8 @@
       VALUE "InternalName", "jv:calipel/s/tests\0"
       VALUE "LegalCopyright", "My CopyRight or CopyLeft\0"
       VALUE "ProductName", "ProductName\0"
-      VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Wed, 21 May 2014 10:01:27 GMT\0"
+      VALUE "ProductVersion", "6.2.4.0\0"
+      VALUE "ProductDate", "Tue, 30 Sep 2014 09:05:08 GMT\0"
     END
 
   END
hg/jv-calipel