Author: borisk
Date: Fri Mar 7 01:09:41 2008
New Revision: 634591
URL: http://svn.apache.org/viewvc?rev=634591&view=rev
Log:
Various build system fixes
Modified:
xerces/c/trunk/Makefile.am
xerces/c/trunk/configure.ac
xerces/c/trunk/src/Makefile.am
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
xerces/c/trunk/version.incl
Modified: xerces/c/trunk/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/Makefile.am?rev=634591&r1=634590&r2=634591&view=diff
==============================================================================
--- xerces/c/trunk/Makefile.am (original)
+++ xerces/c/trunk/Makefile.am Fri Mar 7 01:09:41 2008
@@ -1,6 +1,7 @@
SUBDIRS = src tests samples
-EXTRA_DIST = config/pretty-make \
+EXTRA_DIST = version.incl \
+ config/pretty-make \
scripts/createBindingsFormatFromHPP.pl \
scripts/makeStringDefinition.pl \
scripts/packageBinaries.pl \
@@ -10,10 +11,12 @@
ACLOCAL_AMFLAGS = -I m4
+CLEANFILES = test-results.log
+
check:
- -rm -f tempResult
- export
PATH=${abs_top_builddir}/samples:${abs_top_builddir}/tests:"${PATH}" && export
XERCESC_NLS_HOME=${abs_top_builddir}/src/.libs && cd ${top_srcdir} && perl
scripts/sanityTest.pl 2>&1 | ${SED} 's/ *[0-9][0-9]* *ms */{timing removed}/'
1> ${abs_top_builddir}/tempResult
- diff tempResult ${top_srcdir}/scripts/sanityTest_ExpectedResult.log
+ -rm -f test-results.log
+ export
PATH=${abs_top_builddir}/samples:${abs_top_builddir}/tests:"${PATH}" && export
XERCESC_NLS_HOME=${abs_top_builddir}/src/.libs && cd ${top_srcdir} && perl
scripts/sanityTest.pl 2>&1 | ${SED} 's/ *[0-9][0-9]* *ms */{timing removed}/'
1> ${abs_top_builddir}/test-results.log
+ diff test-results.log
${top_srcdir}/scripts/sanityTest_ExpectedResult.log
test-suite:
cd swig/perl && perl Makefile.PL && make && make test
Modified: xerces/c/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/configure.ac?rev=634591&r1=634590&r2=634591&view=diff
==============================================================================
--- xerces/c/trunk/configure.ac (original)
+++ xerces/c/trunk/configure.ac Fri Mar 7 01:09:41 2008
@@ -24,7 +24,7 @@
#
AC_PREREQ(2.60)
-AC_INIT([xercesc],[3.0])
+AC_INIT([xerces-c],[3.0.0])
AC_CONFIG_SRCDIR([src/Makefile.am])
AC_CONFIG_LIBOBJ_DIR([src])
AC_CONFIG_AUX_DIR([config])
Modified: xerces/c/trunk/src/Makefile.am
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/Makefile.am?rev=634591&r1=634590&r2=634591&view=diff
==============================================================================
--- xerces/c/trunk/src/Makefile.am (original)
+++ xerces/c/trunk/src/Makefile.am Fri Mar 7 01:09:41 2008
@@ -34,7 +34,7 @@
AM_CPPFLAGS =
AM_CXXFLAGS = $(ICU_CXXFLAGS)
-libxerces_c_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libxerces_c_la_LDFLAGS = -release ${INTERFACE_VER_D}
# This sets {install}/include as target for the headers
libxerces_c_ladir = ${includedir}
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in?rev=634591&r1=634590&r2=634591&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
(original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in Fri
Mar 7 01:09:41 2008
@@ -53,7 +53,7 @@
"CPPFLAGS=$(CPPFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "LDFLAGS=$(LDFLAGS)"'
# Resource shortname
-PKGNAME=xercesc_messages_$(VER_UNDERSCORED)
+PKGNAME=xercesc_messages_$(INTERFACE_VER_U)
# Resource files. Add new ones for additional locales here.
# keep in sync with the file RESLIST
@@ -97,7 +97,7 @@
# files. pkgdata does not remove the .dat and README file for some
# reason.
#
-distclean clean:
+clean:
rm -f xercesc_messages.lo
ifeq ($(BUILD_SHARED),yes)
$(PKGDATA) --name $(PKGNAME) --mode dll --clean $(PKGDATAOPTS)
$(RESLIST)
@@ -109,6 +109,20 @@
endif
rm -f $(RESFILES)
rm -f $(PKGNAME).dat
+
+# Distclean is invoked even if we are not building with ICU.
+# As a result, we cannot use pkgdata to clean up.
+#
+distclean:
+ rm -f xercesc_messages.lo
+ rm -f lib$(PKGNAME).so
+ rm -f lib$(PKGNAME).a
+ rm -f $(PKGNAME)_dat*.o
+ rm -f $(PKGNAME)*.lst
+ rm -f $(PKGNAME)*.mak
+ rm -f $(RESFILES)
+ rm -f $(PKGNAME).dat
+ rm -f README_$(PKGNAME).txt
#
#
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak?rev=634591&r1=634590&r2=634591&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak
(original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/ICU/resources/resources.mak Fri
Mar 7 01:09:41 2008
@@ -21,7 +21,7 @@
RESFILES= root.res
-PKGNAME = xercesc_messages_$(VER_UNDERSCORED)
+PKGNAME = xercesc_messages_$(INTERFACE_VER_U)
TARGET_DLL = $(PKGNAME).DLL
TARGET_LIB = $(PKGNAME).lib
Modified: xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in?rev=634591&r1=634590&r2=634591&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in (original)
+++ xerces/c/trunk/src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in Fri Mar
7 01:09:41 2008
@@ -38,7 +38,7 @@
# clean out files
distclean clean: $(CLEAN_SUBDIR)
- -rm $(RESTARGET)
+ -rm -f $(RESTARGET)
## resources
$(PKGNAME)_%.cat: $(srcdir)/$(PKGNAME)_%.Msg
@@ -52,7 +52,7 @@
$(INSTALL_PROGRAM) $(RESTARGET) $(prefix)/msg
uninstall:
- -rm $(prefix)/msg/$(RESFILES)
+ -rm -f $(prefix)/msg/$(RESFILES)
# Needed to support "make dist"
Modified: xerces/c/trunk/version.incl
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/version.incl?rev=634591&r1=634590&r2=634591&view=diff
==============================================================================
--- xerces/c/trunk/version.incl (original)
+++ xerces/c/trunk/version.incl Fri Mar 7 01:09:41 2008
@@ -18,5 +18,5 @@
# $Id$
#
VER=3_0_0
-VER_DOTTED=3.0
-VER_UNDERSCORED=3_0
+INTERFACE_VER_D=3.0
+INTERFACE_VER_U=3_0
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
