--- a/core/XMLv2__DocumentType.st Tue Feb 02 21:49:24 2016 +0000
+++ b/core/XMLv2__DocumentType.st Tue Feb 02 22:25:17 2016 +0000
@@ -158,6 +158,12 @@
^ '$Header: /opt/data/cvs/stx/goodies/xmlsuite/XMLv2__DocumentType.st,v 1.2 2005-12-25 10:52:39 vranyj1 Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
+
--- a/core/bc.mak Tue Feb 02 21:49:24 2016 +0000
+++ b/core/bc.mak Tue Feb 02 22:25:17 2016 +0000
@@ -34,16 +34,26 @@
RESFILES=core.$(RES)
+!ifdef USEMINGW64
+LIBEXPAT=expat-2.0.1/.libs/libexpat.a
+!else
+! ifdef USEMINGW32
+LIBEXPAT=expat-2.0.1/.libs/libexpat.a
+! else
+LIBEXPAT=expat-2.0.1/bcb5/release/libexpats_mtd.lib
+! endif
+!endif
+
LOCALINCLUDES=-Iexpat-2.0.1\lib -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg2
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
-LOCALLIBS="support/expat-2.0.1/bcb5/release/libexpats_mtd.lib"
+LOCALLIBS=$(LIBEXPAT)
OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
-ALL:: support/expat-2.0.1/bcb5/release/libexpats_mtd.lib classLibRule
+ALL:: $(LIBEXPAT) classLibRule
classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
@@ -61,10 +71,11 @@
-support/expat-2.0.1/bcb5/release/libexpats_mtd.lib:
- cd support/expat-2.0.1/bcb5
- $(MAKE)
- cd ..\..\..
+$(LIBEXPAT):
+ pushd expat-2.0.1
+ $(MAKE_BAT)
+ popd
+
--- a/core/expat-2.0.1/mingwmake.bat Tue Feb 02 21:49:24 2016 +0000
+++ b/core/expat-2.0.1/mingwmake.bat Tue Feb 02 22:25:17 2016 +0000
@@ -1,6 +1,6 @@
..\..\
set PATH_ORIG=%PATH%
-set PATH=%MINGW_DIR%\bin;%MINGW_DIR%\MSYS\1.0\bin;C:\MSYS\1.0\bin;%PATH%
+set PATH=%MINGW_DIR%\bin;%MINGW_DIR%\MSYS\1.0\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%PATH%
if not exist makefile (
bash configure
)
--- a/core/stx_goodies_xmlsuite_core.st Tue Feb 02 21:49:24 2016 +0000
+++ b/core/stx_goodies_xmlsuite_core.st Tue Feb 02 22:25:17 2016 +0000
@@ -72,15 +72,35 @@
!stx_goodies_xmlsuite_core class methodsFor:'description - compilation'!
+additionalDefinitions_bc_dot_mak
+ "allows for additional definitions/rules to be added to the bc.mak file.
+ Subclasses may redefine this."
+
+ ^ '
+!!ifdef USEMINGW64
+LIBEXPAT=expat-2.0.1/.libs/libexpat.a
+!!else
+!! ifdef USEMINGW32
+LIBEXPAT=expat-2.0.1/.libs/libexpat.a
+!! else
+LIBEXPAT=expat-2.0.1/bcb5/release/libexpats_mtd.lib
+!! endif
+!!endif
+'
+
+ "Created: / 02-02-2016 / 22:19:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
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"
- ^'"expat-2.0.1/bcb5/release/libexpats_mtd.lib"'
+ ^'$(LIBEXPAT)'
"Created: / 09-01-2010 / 14:01:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-02-2016 / 22:19:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalLinkLibraries_make_dot_proto
@@ -95,14 +115,15 @@
"obsolete - kept for compatibility with old project files"
^ '
-expat-2.0.1/bcb5/release/libexpats_mtd.lib:
- cd expat-2.0.1/bcb5
- $(MAKE)
- cd ..\..\..
+$(LIBEXPAT):
+ pushd expat-2.0.1
+ $(MAKE_BAT)
+ popd
+
'
"Created: / 09-01-2010 / 14:03:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 22-04-2013 / 16:38:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-02-2016 / 22:21:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_make_dot_proto
@@ -122,9 +143,10 @@
additionalTargets_bc_dot_mak
"obsolete - kept for compatibility with old project files"
- ^ 'expat-2.0.1/bcb5/release/libexpats_mtd.lib'
+ ^ '$(LIBEXPAT)'
"Created: / 09-01-2010 / 14:02:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 02-02-2016 / 22:21:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalTargets_make_dot_proto