Fix in ProjectDefinition>>#generateDependencies: jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sun, 09 Jun 2013 00:49:37 +0100
branchjv
changeset 18065 1d9323e0a535
parent 18064 45a5abc336d4
child 18066 89d51443ba6f
Fix in ProjectDefinition>>#generateDependencies: Do not generate duplicate dependencies,
Makefile.init
ProjectDefinition.st
libbasic.rc
mingwmake.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.init	Sun Jun 09 00:49:37 2013 +0100
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+# MACOSX caveat:
+#   as filenames are not case sensitive (in a default setup),
+#   we cannot use tha above trick. Therefore, this file is now named
+#   "Makefile.init", and you have to execute "make -f Makefile.init" to
+#   get the initial makefile.  This is now also done by the toplevel CONFIG
+#   script.
+
+.PHONY: run
+
+run: makefile
+	$(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+	$(TOP)/rules/stmkmf
--- a/ProjectDefinition.st	Wed Jun 05 11:27:29 2013 +0100
+++ b/ProjectDefinition.st	Sun Jun 09 00:49:37 2013 +0100
@@ -834,6 +834,8 @@
     "Created: / 14-09-2006 / 14:59:53 / cg"
 ! !
 
+
+
 !ProjectDefinition class methodsFor:'accessing - packaging'!
 
 classNames:aCollectionOfClassNames
@@ -1099,6 +1101,7 @@
         ].
 ! !
 
+
 !ProjectDefinition class methodsFor:'accessing - tests'!
 
 excludedFromTestSuite
@@ -1893,6 +1896,7 @@
     "Modified: / 29-03-2012 / 18:43:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ProjectDefinition class methodsFor:'defaults'!
 
 applicationTypes
@@ -2109,6 +2113,7 @@
     "Modified: / 17-08-2006 / 19:59:26 / cg"
 ! !
 
+
 !ProjectDefinition class methodsFor:'description - classes'!
 
 additionalClassNamesAndAttributes
@@ -4093,7 +4098,7 @@
             classesLoaded := classesPresent select:[:cls | cls isLoaded].
 
             (Class classesSortedByLoadOrder:classesLoaded) do:putDependencyForClassBlock.
-            classesPresent reject:[:cls | cls isLoaded not] thenDo:putDependencyForClassBlock.
+            classesPresent reject:[:cls | cls isLoaded] thenDo:putDependencyForClassBlock.
 
             self namesAndAttributesIn:(self additionalClassNamesAndAttributes)
                 do:[:className :attr |
@@ -6119,6 +6124,20 @@
     "Created: / 17-08-2006 / 00:21:39 / cg"
 !
 
+loadExtensionsForLanguage: lang
+    "load extension methods for given programming language"
+
+    | filename file |
+    filename := 'extensions.' , lang sourceFileSuffix.
+    file := self packageDirectory / filename.
+    file exists ifTrue:[
+        lang fileIn: file.
+    ]
+
+    "Created: / 17-08-2006 / 00:21:39 / cg"
+    "Created: / 25-11-2011 / 18:13:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 loadMandatoryPreRequisitesAsAutoloaded:asAutoloaded
     "load those packages which are required for loading.
      Called after my definition has been loaded, but before the rest of the
@@ -6135,20 +6154,6 @@
     ].
 !
 
-loadExtensionsForLanguage: lang
-    "load extension methods for given programming language"
-
-    | filename file |
-    filename := 'extensions.' , lang sourceFileSuffix.
-    file := self packageDirectory / filename.
-    file exists ifTrue:[
-        lang fileIn: file.
-    ]
-
-    "Created: / 17-08-2006 / 00:21:39 / cg"
-    "Created: / 25-11-2011 / 18:13:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
 loadPackages:aListOfPackages asAutoloaded:asAutoloaded
     "load some packages (at least the projectDefinitions and their extensions).
      If asAutoloaded == true, classes will be only installed as autoloaded."
--- a/libbasic.rc	Wed Jun 05 11:27:29 2013 +0100
+++ b/libbasic.rc	Sun Jun 09 00:49:37 2013 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libbasic.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1,115
+  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\0"
       VALUE "FileDescription", "Smalltalk/X Basic Classes (LIB)\0"
-      VALUE "FileVersion", "6.2.1.115\0"
+      VALUE "FileVersion", "6.2.32767.32767\0"
       VALUE "InternalName", "stx:libbasic\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2013\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 25 Apr 2013 07:36:51 GMT\0"
+      VALUE "ProductDate", "Sat, 08 Jun 2013 23:48:45 GMT\0"
     END
 
   END
--- a/mingwmake.bat	Wed Jun 05 11:27:29 2013 +0100
+++ b/mingwmake.bat	Sun Jun 09 00:49:37 2013 +0100
@@ -11,6 +11,6 @@
 @pushd ..\rules
 @call find_mingw.bat
 @popd
-make.exe -N -f bc.mak %USEMINGW_ARG% %*
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*