Mercurial Mercurial > hg > stx-libjava / 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.
Added java make target. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 26 Feb 2013 16:57:03 +0000
branchdevelopment
changeset 2432 3e562e3c97a9
parent 2431 8762fc7137c6
child 2433 6868d4b63e4e
Added java make target. This target failes if Java code fail to compile.
JavaNativeMethod.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
Make.spec file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
libInit.cc file | annotate | diff | comparison | revisions
libjava.rc file | annotate | diff | comparison | revisions
stx_libjava.st file | annotate | diff | comparison | revisions 
--- a/JavaNativeMethod.st	Tue Feb 26 12:48:06 2013 +0000
+++ b/JavaNativeMethod.st	Tue Feb 26 16:57:03 2013 +0000
@@ -20,7 +20,7 @@
 "
 "{ Package: 'stx:libjava' }"
 
-JavaMethodWithHandler subclass:#JavaNativeMethod
+JavaMethodWithHandler variableSubclass:#JavaNativeMethod
 	instanceVariableNames:'nativeImplementation nCalls'
 	classVariableNames:'CacheNativeImplementation Verbose TrampolineSelectors'
 	poolDictionaries:''
@@ -53,7 +53,6 @@
 "
 ! !
 
-
 !JavaNativeMethod class methodsFor:'initialization'!
 
 cacheNativeImplementation
@@ -120,7 +119,6 @@
     "Modified: / 31-01-2013 / 14:40:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMethod class methodsFor:'instance creation'!
 
 new
@@ -132,7 +130,6 @@
     "Created: / 31-01-2013 / 13:26:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMethod class methodsFor:'cleanup'!
 
 flushAllCachedNativeMethods
@@ -148,6 +145,12 @@
     "Modified: / 24.12.1999 / 03:10:51 / cg"
 ! !
 
+!JavaNativeMethod class methodsFor:'others'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
 
 !JavaNativeMethod methodsFor:'accessing'!
 
@@ -199,7 +202,6 @@
     "Created: / 17-12-2010 / 10:34:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMethod methodsFor:'private'!
 
 compileNativeImplementation: sel dispatchingTo: oldSel
@@ -415,7 +417,6 @@
     "Modified: / 12-02-2013 / 15:26:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMethod methodsFor:'private-compiler interface'!
 
 numberOfArgs:aNumber
@@ -468,7 +469,6 @@
     "Modified: / 12-02-2013 / 15:28:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMethod methodsFor:'private-trampolines'!
 
 trampolineUncached
@@ -567,7 +567,6 @@
     "Created: / 31-01-2013 / 12:56:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMethod methodsFor:'vm support'!
 
 nativeMethodInvokation
@@ -627,7 +626,6 @@
     "Modified: / 21-01-2013 / 17:35:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !JavaNativeMethod class methodsFor:'documentation'!
 
 version
@@ -638,11 +636,6 @@
     ^ '$Header: /cvs/stx/stx/libjava/JavaNativeMethod.st,v 1.14 2013-02-25 23:30:26 cg Exp $'
 !
 
-version_HG
-
-    ^ '§Changeset: <not expanded> §'
-!
-
 version_SVN
     ^ '§Id§'
 
--- a/Make.proto	Tue Feb 26 12:48:06 2013 +0000
+++ b/Make.proto	Tue Feb 26 16:57:03 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/Make.proto,v 1.22 2013-02-25 13:42:56 cg Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava.
@@ -66,13 +66,15 @@
 pre_objs::  zlib support/fdlibm/libfdm.a antIfPossible 
 
 
+java: ant
+
 ant:
 	ant -f java/build.xml
 
 antIfPossible:
 	-ant -f java/build.xml
 
-
+#full::  ant
 
 zlib:
 	cd $(ZLIB_DIR); $(MAKE) $(MAKE_ZLIB_ARG)
@@ -152,7 +154,6 @@
 	cd ../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
--- a/Make.spec	Tue Feb 26 12:48:06 2013 +0000
+++ b/Make.spec	Tue Feb 26 16:57:03 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/Make.spec,v 1.15 2013-02-25 13:42:54 cg Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava.
--- a/bc.mak	Tue Feb 26 12:48:06 2013 +0000
+++ b/bc.mak	Tue Feb 26 16:57:03 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libjava/bc.mak,v 1.28 2013-02-25 13:42:58 cg Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libjava.
@@ -65,11 +65,12 @@
 	pushd ..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libwidg3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
+java: ant
+
 ant:
 	ant -f java\build.xml
 
--- a/libInit.cc	Tue Feb 26 12:48:06 2013 +0000
+++ b/libInit.cc	Tue Feb 26 16:57:03 2013 +0000
@@ -1,5 +1,5 @@
 /*
- * $Header: /cvs/stx/stx/libjava/libInit.cc,v 1.16 2013-02-25 13:43:06 cg Exp $
+ * $Header$
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libjava.
@@ -13,16 +13,16 @@
 
 #if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
 DLL_EXPORT void _libstx_libjava_Init() INIT_TEXT_SECTION;
-DLL_EXPORT void _libstx_libjava_InitDefinition() INIT_TEXT_SECTION;
+// DLL_EXPORT void _libstx_libjava_InitDefinition() INIT_TEXT_SECTION;
 #endif
 
-void _libstx_libjava_InitDefinition(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libstx_libjava__DFN", _libstx_libjava_InitDefinition, "stx:libjava");
-_stx_137libjava_Init(pass,__pRT__,snd);
+// void _libstx_libjava_InitDefinition(pass, __pRT__, snd)
+// OBJ snd; struct __vmData__ *__pRT__; {
+// __BEGIN_PACKAGE2__("libstx_libjava__DFN", _libstx_libjava_InitDefinition, "stx:libjava");
+// _stx_137libjava_Init(pass,__pRT__,snd);
 
-__END_PACKAGE__();
-}
+// __END_PACKAGE__();
+// }
 
 void _libstx_libjava_Init(pass, __pRT__, snd)
 OBJ snd; struct __vmData__ *__pRT__; {
--- a/libjava.rc	Tue Feb 26 12:48:06 2013 +0000
+++ b/libjava.rc	Tue Feb 26 16:57:03 2013 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1,11
+  FILEVERSION     6,2,32767,32767
   PRODUCTVERSION  6,2,3,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG & SWING Research Group\0"
       VALUE "FileDescription", "Java support for Smalltalk/X (LIB)\0"
-      VALUE "FileVersion", "6.2.1.11\0"
+      VALUE "FileVersion", "6.2.32767.32767\0"
       VALUE "InternalName", "stx:libjava\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Mon, 25 Feb 2013 13:42:46 GMT\0"
+      VALUE "ProductDate", "Tue, 26 Feb 2013 16:54:27 GMT\0"
     END
 
   END
--- a/stx_libjava.st	Tue Feb 26 12:48:06 2013 +0000
+++ b/stx_libjava.st	Tue Feb 26 16:57:03 2013 +0000
@@ -192,6 +192,8 @@
 
 additionalRules_bc_dot_mak
     ^ '
+java: ant
+
 ant:
         ant -f java\build.xml
 
@@ -217,13 +219,15 @@
 
 '
 
-    "Modified: / 15-11-2012 / 23:23:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 26-02-2013 / 16:51:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 additionalRules_make_dot_proto
     ^ '
+java: ant
+
 ant:
-	ant -f java/build.xml
+        ant -f java/build.xml
 
 antIfPossible:
         -ant -f java/build.xml
@@ -238,7 +242,7 @@
 
 '
 
-    "Modified: / 15-11-2012 / 23:22:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 26-02-2013 / 16:51:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 additionalTargets_bc_dot_mak
@@ -703,8 +707,6 @@
     ^ '$Changeset: <not expanded> $'
 ! !
 
-! !
-
 !stx_libjava class methodsFor:'documentation'!
 
 version
hg/stx-libjava