Mercurial Mercurial > hg > stx-goodies-xmlsuite / 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.
buildable on Windows
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sun, 10 Jan 2010 13:30:21 +0000
changeset 178 2ad34ca7768a
parent 177 3362fc45bbfd
child 179 81b698696ae2
buildable on Windows
xmlreaderimpl/trunk/Make.proto file | annotate | diff | comparison | revisions
xmlreaderimpl/trunk/Make.spec file | annotate | diff | comparison | revisions
xmlreaderimpl/trunk/bc.mak file | annotate | diff | comparison | revisions
xmlreaderimpl/trunk/libInit.cc file | annotate | diff | comparison | revisions
xmlreaderimpl/trunk/stx_goodies_xmlsuite_xmlreaderimpl.st file | annotate | diff | comparison | revisions
xmlreaderimpl/trunk/xmlreaderimpl.rc file | annotate | diff | comparison | revisions 
--- a/xmlreaderimpl/trunk/Make.proto	Sun Jan 10 11:11:41 2010 +0000
+++ b/xmlreaderimpl/trunk/Make.proto	Sun Jan 10 13:30:21 2010 +0000
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/xmlsuite/core -I$(INCLUDE_TOP)/stx/goodies/xml/vw -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp
+LOCALINCLUDES=-Isupport/expat-2.0.1/lib -I$(INCLUDE_TOP)/stx/goodies/xmlsuite/core -I$(INCLUDE_TOP)/stx/goodies/xml/vw -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp
 
 
 # if you need any additional defines for embedded C code,
@@ -67,9 +67,9 @@
 
 
 support/expat-2.0.1/build/lib/libexpat.a:
-	mkdir support/expat-2.0.1/build && cd support/expat-2.0.1/build && CFLAGS=-m32 ../configure --prefix=$$PWD
-	$(MAKE) -C support/expat-2.0.1/build
-	$(MAKE) -C support/expat-2.0.1/build install
+    mkdir support/expat-2.0.1/build && cd support/expat-2.0.1/build && CFLAGS=-m32 ../configure --prefix=$$PWD
+    $(MAKE) -C support/expat-2.0.1/build
+    $(MAKE) -C support/expat-2.0.1/build install
 
 
 update-svn-revision:
@@ -106,9 +106,6 @@
 	cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../../libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libtool2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/../cvut/fel/libutilui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../core && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd . && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../../../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -125,6 +122,7 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)XMLv2__ExpatXMLReader.$(O) XMLv2__ExpatXMLReader.$(H): XMLv2__ExpatXMLReader.st $(INCLUDE_TOP)/stx/goodies/xmlsuite/core/XMLv2__XMLReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)XMLv2__VWSAXBuilder.$(O) XMLv2__VWSAXBuilder.$(H): XMLv2__VWSAXBuilder.st $(INCLUDE_TOP)/stx/goodies/xml/vw/SAXBuilder.$(H) $(INCLUDE_TOP)/stx/goodies/xml/vw/NodeBuilder.$(H) $(INCLUDE_TOP)/stx/goodies/xml/vw/XMLNodeBuilder.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)XMLv2__VWXMLReader.$(O) XMLv2__VWXMLReader.$(H): XMLv2__VWXMLReader.st $(INCLUDE_TOP)/stx/goodies/xmlsuite/core/XMLv2__XMLReader.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/goodies/xml/vw/StreamWrapper.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/goodies/xml/vw/XMLParserStX.$(H) $(INCLUDE_TOP)/stx/goodies/xml/vw/XMLParser.$(H) $(STCHDR)
 $(OUTDIR)stx_goodies_xmlsuite_xmlreaderimpl.$(O) stx_goodies_xmlsuite_xmlreaderimpl.$(H): stx_goodies_xmlsuite_xmlreaderimpl.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/xmlreaderimpl/trunk/Make.spec	Sun Jan 10 11:11:41 2010 +0000
+++ b/xmlreaderimpl/trunk/Make.spec	Sun Jan 10 13:30:21 2010 +0000
@@ -50,18 +50,18 @@
 STCWARNINGS=-warnNonStandard
 
 COMMON_CLASSES= \
+	XMLv2::ExpatXMLReader \
 	XMLv2::VWSAXBuilder \
 	XMLv2::VWXMLReader \
-	XMLv2__ExpatXMLReader \
 	stx_goodies_xmlsuite_xmlreaderimpl \
 
 
 
 
 COMMON_OBJS= \
+    $(OUTDIR)XMLv2__ExpatXMLReader.$(O) \
     $(OUTDIR)XMLv2__VWSAXBuilder.$(O) \
     $(OUTDIR)XMLv2__VWXMLReader.$(O) \
-    $(OUTDIR)XMLv2__ExpatXMLReader.$(O) \
     $(OUTDIR)stx_goodies_xmlsuite_xmlreaderimpl.$(O) \
 
 
--- a/xmlreaderimpl/trunk/bc.mak	Sun Jan 10 11:11:41 2010 +0000
+++ b/xmlreaderimpl/trunk/bc.mak	Sun Jan 10 13:30:21 2010 +0000
@@ -28,15 +28,15 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\xmlsuite\core -I$(INCLUDE_TOP)\stx\goodies\xml\vw -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp
+LOCALINCLUDES=-Isupport\expat-2.0.1\lib -I$(INCLUDE_TOP)\stx\goodies\xmlsuite\core -I$(INCLUDE_TOP)\stx\goodies\xml\vw -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
-LOCALLIBS=
+LOCALLIBS=support/expat-2.0.1/bcb5/release/libexpats_mtd.lib
 
 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
 
-ALL::  classLibRule
+ALL:: support/expat-2.0.1/bcb5/release/libexpats_mtd.lib classLibRule
 
 classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
 
@@ -59,17 +59,20 @@
 	pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\libwidg3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\libtool2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\..\cvut\fel\libutilui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\core & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd . & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
+support/expat-2.0.1/bcb5/release/libexpats_mtd.lib:
+    cd support/expat-2.0.1/bcb5
+    $(MAKE)
+    cd ..\..\..
+
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)XMLv2__ExpatXMLReader.$(O) XMLv2__ExpatXMLReader.$(H): XMLv2__ExpatXMLReader.st $(INCLUDE_TOP)\stx\goodies\xmlsuite\core\XMLv2__XMLReader.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)XMLv2__VWSAXBuilder.$(O) XMLv2__VWSAXBuilder.$(H): XMLv2__VWSAXBuilder.st $(INCLUDE_TOP)\stx\goodies\xml\vw\SAXBuilder.$(H) $(INCLUDE_TOP)\stx\goodies\xml\vw\NodeBuilder.$(H) $(INCLUDE_TOP)\stx\goodies\xml\vw\XMLNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)XMLv2__VWXMLReader.$(O) XMLv2__VWXMLReader.$(H): XMLv2__VWXMLReader.st $(INCLUDE_TOP)\stx\goodies\xmlsuite\core\XMLv2__XMLReader.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\goodies\xml\vw\StreamWrapper.$(H) $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\goodies\xml\vw\XMLParserStX.$(H) $(INCLUDE_TOP)\stx\goodies\xml\vw\XMLParser.$(H) $(STCHDR)
 $(OUTDIR)stx_goodies_xmlsuite_xmlreaderimpl.$(O) stx_goodies_xmlsuite_xmlreaderimpl.$(H): stx_goodies_xmlsuite_xmlreaderimpl.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/xmlreaderimpl/trunk/libInit.cc	Sun Jan 10 11:11:41 2010 +0000
+++ b/xmlreaderimpl/trunk/libInit.cc	Sun Jan 10 13:30:21 2010 +0000
@@ -18,9 +18,9 @@
 void _libstx_goodies_xmlsuite_xmlreaderimpl_Init(pass, __pRT__, snd)
 OBJ snd; struct __vmData__ *__pRT__; {
 __BEGIN_PACKAGE2__("libstx_goodies_xmlsuite_xmlreaderimpl", _libstx_goodies_xmlsuite_xmlreaderimpl_Init, "stx:goodies/xmlsuite/xmlreaderimpl");
+_XMLv2__ExpatXMLReader_Init(pass,__pRT__,snd);
 _XMLv2__VWSAXBuilder_Init(pass,__pRT__,snd);
 _XMLv2__VWXMLReader_Init(pass,__pRT__,snd);
-_XMLv2__ExpatXMLReader_Init(pass,__pRT__,snd);
 _stx_137goodies_137xmlsuite_137xmlreaderimpl_Init(pass,__pRT__,snd);
 
 
--- a/xmlreaderimpl/trunk/stx_goodies_xmlsuite_xmlreaderimpl.st	Sun Jan 10 11:11:41 2010 +0000
+++ b/xmlreaderimpl/trunk/stx_goodies_xmlsuite_xmlreaderimpl.st	Sun Jan 10 13:30:21 2010 +0000
@@ -60,6 +60,17 @@
 
 !stx_goodies_xmlsuite_xmlreaderimpl class methodsFor:'description - compilation'!
 
+additionalLinkLibraries_bc_dot_mak
+    "allows for additional static libraries to be added to the bc.mak file.
+     Subclasses may redefine this"
+
+    "backward compatibilty with old projects"
+
+    ^'support/expat-2.0.1/bcb5/release/libexpats_mtd.lib'
+
+    "Created: / 09-01-2010 / 14:01:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 additionalLinkLibraries_make_dot_proto
     "allows for additional static libraries to be added to the make.proto file."
 
@@ -68,6 +79,19 @@
     "Created: / 22-08-2006 / 23:53:33 / cg"
 !
 
+additionalRules_bc_dot_mak
+    "obsolete - kept for compatibility with old project files"
+    
+    ^ '
+support/expat-2.0.1/bcb5/release/libexpats_mtd.lib:
+    cd support/expat-2.0.1/bcb5
+    $(MAKE)
+    cd ..\..\..
+'
+
+    "Created: / 09-01-2010 / 14:03:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 additionalRules_make_dot_proto
     "allows for additional rules to be added to the make.proto file."
 
@@ -81,12 +105,28 @@
     "Created: / 22-08-2006 / 23:59:16 / cg"
 !
 
+additionalTargets_bc_dot_mak
+    "obsolete - kept for compatibility with old project files"
+    
+    ^ 'support/expat-2.0.1/bcb5/release/libexpats_mtd.lib'
+
+    "Created: / 09-01-2010 / 14:02:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 additionalTargets_make_dot_proto
     "allows for additional targets to be added to the make.proto file."
 
     ^ 'support/expat-2.0.1/build/lib/libexpat.a'
 
     "Created: / 22-08-2006 / 23:53:33 / cg"
+!
+
+localIncludes
+    "allow for the specification of additional include directories"
+
+    ^ '-Isupport/expat-2.0.1/lib'
+
+    "Created: / 09-01-2010 / 14:03:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !stx_goodies_xmlsuite_xmlreaderimpl class methodsFor:'description - contents'!
@@ -99,7 +139,7 @@
 
     ^ #(
         "<className> or (<className> attributes...) in load order"
-        #'XMLv2::ExpatXMLReader' 
+        #'XMLv2::ExpatXMLReader'
         (#'XMLv2::XercesCXMLReader' autoload)
         #'XMLv2::VWSAXBuilder'
         #'XMLv2::VWXMLReader'
--- a/xmlreaderimpl/trunk/xmlreaderimpl.rc	Sun Jan 10 11:11:41 2010 +0000
+++ b/xmlreaderimpl/trunk/xmlreaderimpl.rc	Sun Jan 10 13:30:21 2010 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_goodies_xmlsuite_xmlreaderimpl.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     5,4,0,1
+  FILEVERSION     5,4,178,178
   PRODUCTVERSION  5,4,6,1
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
   FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -18,12 +18,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
-      VALUE "FileVersion", "5.4.0.1\0"
+      VALUE "FileVersion", "5.4.178.178\0"
       VALUE "InternalName", "stx:goodies/xmlsuite/xmlreaderimpl\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2008\nCopyright eXept Software AG 1998-2008\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "5.4.6.1\0"
-      VALUE "ProductDate", "Sat, 09 Jan 2010 12:07:35 GMT\0"
+      VALUE "ProductDate", "Sat, 09 Jan 2010 22:22:44 GMT\0"
     END
 
   END
hg/stx-goodies-xmlsuite