Workaround to compile also under CVS Smalltalk/X.
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 04 Sep 2013 08:38:25 +0100
changeset 79 3b73ae3e1aeb
parent 78 16cd76c8d70c
child 80 10d72b51e05e
Workaround to compile also under CVS Smalltalk/X. The problem is that in stx:libtool, jv-branch all files conform to a naming convertion whereas in CVS not. Therefore the makefiles generated under jv-branch refer .H files which does not exist in CVS. This commit fixes this by adding extra rules that copy files if they does not exist.
Make.proto
bc.mak
jv_smallsense.st
smallsense.rc
--- a/Make.proto	Mon Sep 02 14:45:35 2013 +0100
+++ b/Make.proto	Wed Sep 04 08:38:25 2013 +0100
@@ -66,6 +66,10 @@
 pre_objs::  
 
 
+# HACK to make it compilable under CVS stx:libtool
+$(INCLUDE_TOP)/stx/libtool/Tools__NavigationState.$(H): $(INCLUDE_TOP)/stx/libtool/Tools_NavigationState.$(H)
+	ln -s $(INCLUDE_TOP)/stx/libtool/Tools_NavigationState.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigationState.$(H)
+
 
 
 # Update SVN revision in package definition class
--- a/bc.mak	Mon Sep 02 14:45:35 2013 +0100
+++ b/bc.mak	Wed Sep 04 08:38:25 2013 +0100
@@ -70,6 +70,10 @@
 
 
 
+# HACK to make it compilable under CVS stx:libtool
+$(INCLUDE_TOP)\stx\libtool\Tools__NavigationState.$(H): $(INCLUDE_TOP)\stx\libtool\Tools_NavigationState.$(H)
+	copy $(INCLUDE_TOP)\stx\libtool\Tools_NavigationState.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigationState.$(H)
+
 
 
 
--- a/jv_smallsense.st	Mon Sep 02 14:45:35 2013 +0100
+++ b/jv_smallsense.st	Wed Sep 04 08:38:25 2013 +0100
@@ -119,6 +119,32 @@
     "Created: / 02-09-2013 / 12:30:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!jv_smallsense class methodsFor:'description - compilation'!
+
+additionalRules_bc_dot_mak
+    "obsolete - kept for compatibility with old project files"
+
+    ^ '
+# HACK to make it compilable under CVS stx:libtool
+$(INCLUDE_TOP)\stx\libtool\Tools__NavigationState.$(H): $(INCLUDE_TOP)\stx\libtool\Tools_NavigationState.$(H)
+        copy $(INCLUDE_TOP)\stx\libtool\Tools_NavigationState.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigationState.$(H)
+'
+
+    "Created: / 04-09-2013 / 08:28:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+additionalRules_make_dot_proto
+    "allows for additional rules to be added to the make.proto file."
+
+    ^ '
+# HACK to make it compilable under CVS stx:libtool
+$(INCLUDE_TOP)/stx/libtool/Tools__NavigationState.$(H): $(INCLUDE_TOP)/stx/libtool/Tools_NavigationState.$(H)
+        ln -s $(INCLUDE_TOP)/stx/libtool/Tools_NavigationState.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigationState.$(H)
+'
+
+    "Created: / 04-09-2013 / 08:02:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !jv_smallsense class methodsFor:'description - contents'!
 
 classNamesAndAttributes
--- a/smallsense.rc	Mon Sep 02 14:45:35 2013 +0100
+++ b/smallsense.rc	Wed Sep 04 08:38:25 2013 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Mon, 02 Sep 2013 12:07:14 GMT\0"
+      VALUE "ProductDate", "Wed, 04 Sep 2013 07:32:20 GMT\0"
     END
 
   END