[Extras-wsdlpull-svn] SF.net SVN: extras-wsdlpull:[198] trunk/wsdlpull
Status: Beta
Brought to you by:
denis_arnaud
Menu
▾
▴
[Extras-wsdlpull-svn] SF.net SVN: extras-wsdlpull:[198] trunk/wsdlpull
|
From: <den...@us...> - 2010-07-18 16:35:54
|
Revision: 198
http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=198&view=rev
Author: denis_arnaud
Date: 2010-07-18 16:35:47 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
[Dev] The names of binaries and libraries are now prefixed with wsdlpull.
Modified Paths:
--------------
trunk/wsdlpull/Makefile.am
trunk/wsdlpull/autogen.sh
trunk/wsdlpull/configure.in
trunk/wsdlpull/docs/Makefile.am
trunk/wsdlpull/examples/Makefile.am
trunk/wsdlpull/examples/gsoap/Makefile.am
trunk/wsdlpull/examples/print/Makefile.am
trunk/wsdlpull/examples/schema/Makefile.am
trunk/wsdlpull/examples/stocks/Makefile.am
trunk/wsdlpull/examples/xml/Makefile.am
trunk/wsdlpull/man/Makefile.am
trunk/wsdlpull/src/Makefile.am
trunk/wsdlpull/src/schemaparser/Makefile.am
trunk/wsdlpull/src/schemas/Makefile.am
trunk/wsdlpull/src/tools/Makefile.am
trunk/wsdlpull/src/utils/Makefile.am
trunk/wsdlpull/src/wsdlparser/Makefile.am
trunk/wsdlpull/src/xmlpull/Makefile.am
trunk/wsdlpull/src/xmlpull/XmlSerializer.cpp
trunk/wsdlpull/src/xmlpull/XmlSerializer.h
Property Changed:
----------------
trunk/wsdlpull/src/tools/
Modified: trunk/wsdlpull/Makefile.am
===================================================================
--- trunk/wsdlpull/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,22 +1,6 @@
-#***************************************************************************
-#
-# Project wsdlpull
-# Copyright (C) 2004, Vivek Krishna, <viv...@us...>
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-###########################################################################
+## wsdlpull
+AUTOMAKE_OPTIONS = dist-bzip2
-AUTOMAKE_OPTIONS = foreign dist-bzip2
-
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
src/config-h.in config/stamp-h.in
Modified: trunk/wsdlpull/autogen.sh
===================================================================
--- trunk/wsdlpull/autogen.sh 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/autogen.sh 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,5 @@
#! /bin/sh
-# $Id: autogen.sh,v 1.4 2002/12/02 01:39:49 murrayc Exp $
-#
# Copyright (c) 2002 Daniel Elstner <dan...@gm...>
#
# This program is free software; you can redistribute it and/or modify
Modified: trunk/wsdlpull/configure.in
===================================================================
--- trunk/wsdlpull/configure.in 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/configure.in 2010-07-18 16:35:47 UTC (rev 198)
@@ -2,7 +2,7 @@
#-------------------------------------------------------------------
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2007-2010 Vivek Krishna <viv...@us...>])
-AC_INIT([WSDLPull],[1.23],[viv...@us...],[wsdlpull])
+AC_INIT([WSDLPull],[1.24],[viv...@us...],[wsdlpull])
AC_CONFIG_HEADER([src/config.h])
AC_CONFIG_SRCDIR([src/wsdlparser/WsdlParser.cpp])
AC_CONFIG_AUX_DIR([config])
@@ -13,7 +13,7 @@
# Configure file for wsdlpull
# Shared library versioning
-GENERIC_LIBRARY_VERSION="1:23:0"
+GENERIC_LIBRARY_VERSION="1:24:0"
# | | |
# +------+ | +---+
# | | |
Modified: trunk/wsdlpull/docs/Makefile.am
===================================================================
--- trunk/wsdlpull/docs/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/docs/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -5,6 +5,8 @@
include $(top_srcdir)/src/schemaparser/sources.mk
include $(top_srcdir)/src/tools/sources.mk
+MAINTAINERCLEANFILES = Makefile.in
+
docdir = @docdir@
html_tarname = @PACKAGE_TARNAME@-doc-@PACKAGE_VERSION@
@@ -46,3 +48,4 @@
clean-local:
rm -rf html *.log *.tag
+
Modified: trunk/wsdlpull/examples/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,6 +1,7 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples
+## This is the input file for automake, which will generate Makefile.in ##
+
+MAINTAINERCLEANFILES = Makefile.in
+
SUBDIRS = print xml stocks
Modified: trunk/wsdlpull/examples/gsoap/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/gsoap/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/gsoap/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,26 +1,34 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/gsoap
+## This is the input file for automake, which will generate Makefile.in ##
-CPPFLAGS = -DDATADIR=\"$(bindir)/\" @CPPFLAGS@
+MAINTAINERCLEANFILES = Makefile.in
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
+#
+pkginclude_HEADERS = gsoap.h
+pkgincludedir = $(includedir)/wsdlpull/examples
-pkginclude_HEADERS = gsoap.h
-pkgincludedir= $(includedir)/examples
+#
+bin_SCRIPTS = typedefs.h mainStart.stub mainEnd.stub includes.h
-bin_SCRIPTS=typedefs.h mainStart.stub mainEnd.stub includes.h
-
+#
lib_LTLIBRARIES = libwsdl2gsoap.la
-libwsdl2gsoap_la_SOURCES=gsoap.cpp gsoap_utility.cpp gsoap.h
+libwsdl2gsoap_la_SOURCES = gsoap.cpp gsoap_utility.cpp gsoap.h
-bin_PROGRAMS=wsdl2cpp
-wsdl2cpp_SOURCES = driver.cpp
-wsdl2cpp_LDADD= $(top_builddir)/examples/gsoap/libwsdl2gsoap.la $(top_builddir)/src/wsdlparser/libwsdl.la $(top_builddir)/src/schemaparser/libschema.la $(top_builddir)/src/xmlpull/libxmlpull.la $(top_builddir)/src/utils/libutils.la
+#
+bin_PROGRAMS = wsdl2cpp
+wsdl2cpp_SOURCES = driver.cpp
+wsdl2cpp_CPPFLAGS = -DDATADIR=\"$(bindir)/\"
+wsdl2cpp_LDFLAGS = \
+ $(top_builddir)/examples/gsoap/libwsdl2gsoap.la \
+ $(top_builddir)/src/wsdlparser/libwsdl.la \
+ $(top_builddir)/src/schemaparser/libschema.la \
+ $(top_builddir)/src/xmlpull/libxmlpull.la \
+ $(top_builddir)/src/utils/libutils.la
+#
+docsdir = $(prefix)/docs
+docs_DATA = README_gsoap.txt
-docsdir=$(prefix)/docs
-docs_DATA=README_gsoap.txt
+EXTRA_DIST = $(docs_DATA) \
+ typedefs.h mainStart.stub mainEnd.stub includes.h wsdl2cpp.dsp
-EXTRA_DIST=typedefs.h mainStart.stub mainEnd.stub includes.h wsdl2cpp.dsp $(docs_DATA)
Modified: trunk/wsdlpull/examples/print/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/print/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/print/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,16 +1,21 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/print
+## This is the input file for automake, which will generate Makefile.in ##
-CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
+MAINTAINERCLEANFILES = Makefile.in
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-LDADD=$(top_builddir)/src/wsdlparser/libwsdl.la $(top_builddir)/src/schemaparser/libschema.la $(top_builddir)/src/xmlpull/libxmlpull.la
-bin_PROGRAMS=print
+#
+bin_PROGRAMS = print
-print_SOURCES = print.cpp
+print_SOURCES = print.cpp
+print_CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\"
+print_LDFLAGS = \
+ $(top_builddir)/src/wsdlparser/libwsdlpull.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la
-docsdir=$(prefix)/docs
-docs_DATA=README_print.txt
-EXTRA_DIST=$(docs_DATA)
+#
+docsdir = $(prefix)/docs
+docs_DATA = README_print.txt
+
+EXTRA_DIST = $(docs_DATA)
+
Modified: trunk/wsdlpull/examples/schema/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/schema/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/schema/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,15 +1,21 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/schema
+## This is the input file for automake, which will generate Makefile.in ##
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-LDADD=$(top_builddir)/src/schemaparser/libschema.la $(top_builddir)/src/xmlpull/libxmlpull.la $(top_builddir)/src/utils/libutils.la
+MAINTAINERCLEANFILES = Makefile.in
-bin_PROGRAMS=schema
+#
+bin_PROGRAMS = schema
-schema_SOURCES = schema.cpp
+schema_SOURCES = schema.cpp
+schema_LDFLAGS = \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
+ $(top_builddir)/src/utils/libwsdlpullutils.la
-docsdir=$(prefix)/docs
-docs_DATA=README_schema.txt
-EXTRA_DIST=schema.dsp complexTypes.xsd first-building-blocks.xsd first-complex-types.xsd list.xsd po.xsd simpleTypes.xsd first.xml list.xml $(docs_DATA)
+#
+docsdir = $(prefix)/docs
+docs_DATA = README_schema.txt
+EXTRA_DIST = $(docs_DATA) \
+ schema.dsp complexTypes.xsd first-building-blocks.xsd first-complex-types.xsd \
+ list.xsd po.xsd simpleTypes.xsd first.xml list.xml
+
Modified: trunk/wsdlpull/examples/stocks/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/stocks/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/stocks/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,12 +1,15 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/stocks
+## This is the input file for automake, which will generate Makefile.in ##
-CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
+MAINTAINERCLEANFILES = Makefile.in
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-LDADD=$(top_builddir)/src/wsdlparser/libwsdl.la $(top_builddir)/src/schemaparser/libschema.la $(top_builddir)/src/xmlpull/libxmlpull.la
-bin_PROGRAMS=stocks
+#
+bin_PROGRAMS = stocks
-stocks_SOURCES=stocks.cpp
+stocks_SOURCES = stocks.cpp
+stocks_CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\"
+stocks_LDFLAGS = \
+ $(top_builddir)/src/wsdlparser/libwsdlpull.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la
+
Modified: trunk/wsdlpull/examples/xml/Makefile.am
===================================================================
--- trunk/wsdlpull/examples/xml/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/examples/xml/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,10 +1,11 @@
-####### This is the input file for automake, which will generate Makefile.in ##########
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## examples/xml
+## This is the input file for automake, which will generate Makefile.in ##
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-LDADD=$(top_builddir)/src/xmlpull/libxmlpull.la
+MAINTAINERCLEANFILES = Makefile.in
-bin_PROGRAMS=roundtrip
-roundtrip_SOURCES =roundtrip.cpp
+#
+bin_PROGRAMS = roundtrip
+
+roundtrip_SOURCES = roundtrip.cpp
+roundtrip_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la
+
Modified: trunk/wsdlpull/man/Makefile.am
===================================================================
--- trunk/wsdlpull/man/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/man/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,4 +1,8 @@
# Man pages
+
+MAINTAINERCLEANFILES = Makefile.in
+
man_MANS = wsdlpull.1 wsdlpull-schema.1 wsdlpull-config.1
EXTRA_DIST = $(man_MANS)
+
Modified: trunk/wsdlpull/src/Makefile.am
===================================================================
--- trunk/wsdlpull/src/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,22 +1,7 @@
-#***************************************************************************
+# wsdlpull/src
#
-# Project wsdlpull
-# Copyright (C) 2004, Vivek Krishna, <viv...@us...>
-#
-# This software is licensed as described in the file COPYING, which
-# you should have received as part of this distribution.
-#
-# You may opt to use, copy, modify, merge, publish, distribute and/or sell
-# copies of the Software, and permit persons to whom the Software is
-# furnished to do so, under the terms of the COPYING file.
-#
-# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
-# KIND, either express or implied.
-#
-###########################################################################
-AUTOMAKE_OPTIONS = foreign
+MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = xmlpull schemaparser wsdlparser schemas tools
-MAINTAINERCLEANFILES = Makefile.in
Modified: trunk/wsdlpull/src/schemaparser/Makefile.am
===================================================================
--- trunk/wsdlpull/src/schemaparser/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/schemaparser/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,4 @@
## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in
@@ -11,11 +8,12 @@
INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
-lib_LTLIBRARIES = libschema.la
+lib_LTLIBRARIES = libwsdlpullschema.la
-libschema_la_SOURCES = $(schema_h_sources) $(schema_cc_sources)
-libschema_la_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
+libwsdlpullschema_la_SOURCES = $(schema_h_sources) $(schema_cc_sources)
+libwsdlpullschema_la_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
-version-info $(GENERIC_LIBRARY_VERSION)
pkginclude_HEADERS = $(schema_h_sources)
-pkgincludedir= $(includedir)/schemaparser
+pkgincludedir= $(includedir)/wsdlpull/schemaparser
+
Modified: trunk/wsdlpull/src/schemas/Makefile.am
===================================================================
--- trunk/wsdlpull/src/schemas/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/schemas/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,8 @@
-## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
+## This is the input file for automake, which will generate Makefile.in ##
-pkginclude_HEADERS = soap.xsd wsdl10.xsd mime.xsd http.xsd soap-encoding.xsd schema.dtd schema.conf soap12.xsd soap-encoding12.xsd
+MAINTAINERCLEANFILES = Makefile.in
+
+pkginclude_HEADERS = soap.xsd wsdl10.xsd mime.xsd http.xsd soap-encoding.xsd \
+ schema.dtd schema.conf soap12.xsd soap-encoding12.xsd
pkgincludedir= $(datadir)/wsdlpull
+
Property changes on: trunk/wsdlpull/src/tools
___________________________________________________________________
Modified: svn:ignore
- .deps
.libs
Makefile
Makefile.in
schema
wsdl
+ .deps
.libs
Makefile
Makefile.in
wsdlpull
wsdlpull-schema
Modified: trunk/wsdlpull/src/tools/Makefile.am
===================================================================
--- trunk/wsdlpull/src/tools/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/tools/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,4 @@
## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in
@@ -16,12 +13,14 @@
## Dynamic Web service invocation
wsdlpull_SOURCES = $(wsdltool_cc_sources)
-wsdlpull_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la \
- $(top_builddir)/src/wsdlparser/libwsdl.la
+wsdlpull_LDFLAGS = \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
+ $(top_builddir)/src/wsdlparser/libwsdlpull.la
## Schema validation tool
wsdlpull_schema_SOURCES = $(schematool_cc_sources)
-wsdlpull_schema_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la
+wsdlpull_schema_LDFLAGS = \
+ $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la
Modified: trunk/wsdlpull/src/utils/Makefile.am
===================================================================
--- trunk/wsdlpull/src/utils/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/utils/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,10 +1,12 @@
+## wsdlpull/utils
## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-INCLUDES=-I$(top_builddir) -I$(top_builddir)/src -I.
-lib_LTLIBRARIES = libutils.la
-libutils_la_SOURCES=utils.h utility.cpp net.cpp
+MAINTAINERCLEANFILES = Makefile.in
+
+#
+lib_LTLIBRARIES = libwsdlpullutils.la
+libwsdlpullutils_la_SOURCES = utils.h utility.cpp net.cpp
+
pkginclude_HEADERS = utils.h
-pkgincludedir= $(includedir)/utils
+pkgincludedir= $(includedir)/wsdlpull/utils
+
Modified: trunk/wsdlpull/src/wsdlparser/Makefile.am
===================================================================
--- trunk/wsdlpull/src/wsdlparser/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/wsdlparser/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,7 +1,4 @@
## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in
@@ -11,12 +8,13 @@
INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
CPPFLAGS = -DSCHEMADIR=\"$(datadir)/wsdlpull/\" @CPPFLAGS@
-lib_LTLIBRARIES = libwsdl.la
+lib_LTLIBRARIES = libwsdlpull.la
-libwsdl_la_SOURCES = $(wsdl_h_sources) $(wsdl_cc_sources)
-libwsdl_la_LDFLAGS = $(top_builddir)/src/xmlpull/libxmlpull.la \
- $(top_builddir)/src/schemaparser/libschema.la \
+libwsdlpull_la_SOURCES = $(wsdl_h_sources) $(wsdl_cc_sources)
+libwsdlpull_la_LDFLAGS = $(top_builddir)/src/xmlpull/libwsdlpullxml.la \
+ $(top_builddir)/src/schemaparser/libwsdlpullschema.la \
-version-info $(GENERIC_LIBRARY_VERSION)
pkginclude_HEADERS = $(schema_h_sources)
-pkgincludedir= $(includedir)/wsdlparser
+pkgincludedir= $(includedir)/wsdlpull/wsdlparser
+
Modified: trunk/wsdlpull/src/xmlpull/Makefile.am
===================================================================
--- trunk/wsdlpull/src/xmlpull/Makefile.am 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/xmlpull/Makefile.am 2010-07-18 16:35:47 UTC (rev 198)
@@ -1,19 +1,17 @@
-## This is the input file for automake, which will generate Makefile.in ##
-## not a GNU package. You can remove this line, if
-## you have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign
-
-MAINTAINERCLEANFILES = Makefile.in
-
-# src/xmlpull
-include $(srcdir)/sources.mk
-
-INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
-
-lib_LTLIBRARIES = libxmlpull.la
-
-libxmlpull_la_SOURCES = $(xmlpull_h_sources) $(xmlpull_cc_sources)
-libxmlpull_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
-
-pkginclude_HEADERS = $(xmlpull_h_sources)
-pkgincludedir= $(includedir)/xmlpull
+## This is the input file for automake, which will generate Makefile.in ##
+
+MAINTAINERCLEANFILES = Makefile.in
+
+# src/xmlpull
+include $(srcdir)/sources.mk
+
+INCLUDES = -I$(top_builddir) -I$(top_builddir)/src -I.
+
+lib_LTLIBRARIES = libwsdlpullxml.la
+
+libwsdlpullxml_la_SOURCES = $(xmlpull_h_sources) $(xmlpull_cc_sources)
+libwsdlpullxml_la_LDFLAGS = -lpthread -version-info $(GENERIC_LIBRARY_VERSION)
+
+pkginclude_HEADERS = $(xmlpull_h_sources)
+pkgincludedir= $(includedir)/wsdlpull/xml
+
Modified: trunk/wsdlpull/src/xmlpull/XmlSerializer.cpp
===================================================================
--- trunk/wsdlpull/src/xmlpull/XmlSerializer.cpp 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/xmlpull/XmlSerializer.cpp 2010-07-18 16:35:47 UTC (rev 198)
@@ -276,7 +276,7 @@
if (prefix==defined)
return;
- int pos = (nspCounts[depth + 1]++) << 1;
+ unsigned int pos = (nspCounts[depth + 1]++) << 1;
if (nspStack.size() < pos + 1) {
nspStack.resize(nspStack.size() + 16);
@@ -320,11 +320,11 @@
if (indent[depth]) {
writer<<"\r\n";
- for (int i = 0; i < depth; i++)
+ for (unsigned int i = 0; i < depth; i++)
writer<<" ";
}
- int esp = depth * 3;
+ unsigned int esp = depth * 3;
if (elementStack.size() < esp + 3) {
elementStack.resize(elementStack.size() + 16);
}
@@ -440,7 +440,7 @@
else {
if (indent[depth + 1]) {
writer<<"\r\n";
- for (int i = 0; i < depth; i++)
+ for (unsigned int i = 0; i < depth; i++)
writer<<" ";
}
Modified: trunk/wsdlpull/src/xmlpull/XmlSerializer.h
===================================================================
--- trunk/wsdlpull/src/xmlpull/XmlSerializer.h 2010-07-18 15:51:14 UTC (rev 197)
+++ trunk/wsdlpull/src/xmlpull/XmlSerializer.h 2010-07-18 16:35:47 UTC (rev 198)
@@ -71,7 +71,7 @@
std::ostream& writer;
bool pending;
int auto_;
- int depth;
+ unsigned int depth;
std::string encoding;
std::vector<std::string> elementStack,nspStack;
//nsp/prefix/name
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
