From f429e2c55f77d5869683d902c9f4d96df1678d6c Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 3 May 2017 09:18:25 +0200 Subject: Get rid of legacy build systems --- INSTALL | 88 +----- INSTALL-GIT | 79 ----- Makefile.am | 11 - bootstrap | 17 -- build/bootstrap.make | 70 ----- build/export/libstudxml/stub.make | 9 - build/import/libstudxml/LICENSE | 1 - build/import/libstudxml/configuration-rules.make | 14 - build/import/libstudxml/configure | 52 ---- build/import/libstudxml/stub.make | 29 -- configure.ac | 85 ------ doc/Makefile.am | 5 - doc/makefile | 18 -- examples/Makefile.am | 6 - examples/buildfile | 6 +- examples/examples-vc10.sln | 15 - examples/examples-vc11.sln | 15 - examples/examples-vc12.sln | 17 -- examples/examples-vc9.sln | 15 - examples/hybrid/makefile | 90 ------ examples/inheritance/makefile | 90 ------ examples/makefile | 41 --- examples/performance/makefile | 90 ------ examples/persistence/makefile | 90 ------ examples/processing/makefile | 88 ------ examples/roundtrip/makefile | 88 ------ examples/template/Makefile.am | 19 -- examples/template/template-vc10.vcxproj | 167 ----------- examples/template/template-vc10.vcxproj.filters | 20 -- examples/template/template-vc11.vcxproj | 171 ----------- examples/template/template-vc11.vcxproj.filters | 20 -- examples/template/template-vc12.vcxproj | 175 ----------- examples/template/template-vc12.vcxproj.filters | 20 -- examples/template/template-vc9.vcproj | 352 ---------------------- examples/test.bat | 74 ----- examples/xhtml/makefile | 88 ------ libstudxml-vc10.sln | 26 -- libstudxml-vc11.sln | 26 -- libstudxml-vc12.sln | 28 -- libstudxml-vc9.sln | 26 -- libstudxml.pc.in | 15 - libstudxml/Makefile.am | 31 -- libstudxml/buildfile | 24 +- libstudxml/details/build2/config-vc.h | 20 -- libstudxml/details/build2/config.h | 45 --- libstudxml/details/config-vc.h | 4 +- libstudxml/details/config.h | 40 +++ libstudxml/details/config.h.in | 15 - libstudxml/details/config.hxx | 16 +- libstudxml/details/expat/config.h | 14 +- libstudxml/details/export.hxx | 34 --- libstudxml/libstudxml-vc10.vcxproj | 175 ----------- libstudxml/libstudxml-vc10.vcxproj.filters | 24 -- libstudxml/libstudxml-vc11.vcxproj | 179 ----------- libstudxml/libstudxml-vc11.vcxproj.filters | 24 -- libstudxml/libstudxml-vc12.vcxproj | 179 ----------- libstudxml/libstudxml-vc12.vcxproj.filters | 24 -- libstudxml/libstudxml-vc9.vcproj | 360 ----------------------- libstudxml/makefile | 143 --------- m4/diff.m4 | 54 ---- m4/disable-rpath.m4 | 25 -- m4/libexpat.m4 | 39 --- m4/libtool-link.m4 | 46 --- m4/pkgconfig.m4 | 12 - m4/static-lib.m4 | 18 -- makefile | 38 --- tester.bat | 68 ----- tester.in | 44 --- tests/Makefile.am | 6 - tests/buildfile | 4 +- tests/makefile | 37 --- tests/parser/makefile | 89 ------ tests/roundtrip/makefile | 102 ------- tests/serializer/makefile | 91 ------ tests/template/Makefile.am | 21 -- tests/template/template-vc10.vcxproj | 167 ----------- tests/template/template-vc10.vcxproj.filters | 20 -- tests/template/template-vc11.vcxproj | 171 ----------- tests/template/template-vc11.vcxproj.filters | 20 -- tests/template/template-vc12.vcxproj | 171 ----------- tests/template/template-vc12.vcxproj.filters | 20 -- tests/template/template-vc9.vcproj | 352 ---------------------- tests/test.bat | 74 ----- tests/tests-vc10.sln | 15 - tests/tests-vc11.sln | 15 - tests/tests-vc12.sln | 17 -- tests/tests-vc9.sln | 15 - 87 files changed, 60 insertions(+), 5398 deletions(-) delete mode 100644 INSTALL-GIT delete mode 100644 Makefile.am delete mode 100755 bootstrap delete mode 100644 build/bootstrap.make delete mode 100644 build/export/libstudxml/stub.make delete mode 120000 build/import/libstudxml/LICENSE delete mode 100644 build/import/libstudxml/configuration-rules.make delete mode 100755 build/import/libstudxml/configure delete mode 100644 build/import/libstudxml/stub.make delete mode 100644 configure.ac delete mode 100644 doc/Makefile.am delete mode 100644 doc/makefile delete mode 100644 examples/Makefile.am delete mode 100644 examples/examples-vc10.sln delete mode 100644 examples/examples-vc11.sln delete mode 100644 examples/examples-vc12.sln delete mode 100644 examples/examples-vc9.sln delete mode 100644 examples/hybrid/makefile delete mode 100644 examples/inheritance/makefile delete mode 100644 examples/makefile delete mode 100644 examples/performance/makefile delete mode 100644 examples/persistence/makefile delete mode 100644 examples/processing/makefile delete mode 100644 examples/roundtrip/makefile delete mode 100644 examples/template/Makefile.am delete mode 100644 examples/template/template-vc10.vcxproj delete mode 100644 examples/template/template-vc10.vcxproj.filters delete mode 100644 examples/template/template-vc11.vcxproj delete mode 100644 examples/template/template-vc11.vcxproj.filters delete mode 100644 examples/template/template-vc12.vcxproj delete mode 100644 examples/template/template-vc12.vcxproj.filters delete mode 100644 examples/template/template-vc9.vcproj delete mode 100644 examples/test.bat delete mode 100644 examples/xhtml/makefile delete mode 100644 libstudxml-vc10.sln delete mode 100644 libstudxml-vc11.sln delete mode 100644 libstudxml-vc12.sln delete mode 100644 libstudxml-vc9.sln delete mode 100644 libstudxml.pc.in delete mode 100644 libstudxml/Makefile.am delete mode 100644 libstudxml/details/build2/config-vc.h delete mode 100644 libstudxml/details/build2/config.h create mode 100644 libstudxml/details/config.h delete mode 100644 libstudxml/details/config.h.in delete mode 100644 libstudxml/libstudxml-vc10.vcxproj delete mode 100644 libstudxml/libstudxml-vc10.vcxproj.filters delete mode 100644 libstudxml/libstudxml-vc11.vcxproj delete mode 100644 libstudxml/libstudxml-vc11.vcxproj.filters delete mode 100644 libstudxml/libstudxml-vc12.vcxproj delete mode 100644 libstudxml/libstudxml-vc12.vcxproj.filters delete mode 100644 libstudxml/libstudxml-vc9.vcproj delete mode 100644 libstudxml/makefile delete mode 100644 m4/diff.m4 delete mode 100644 m4/disable-rpath.m4 delete mode 100644 m4/libexpat.m4 delete mode 100644 m4/libtool-link.m4 delete mode 100644 m4/pkgconfig.m4 delete mode 100644 m4/static-lib.m4 delete mode 100644 makefile delete mode 100644 tester.bat delete mode 100755 tester.in delete mode 100644 tests/Makefile.am delete mode 100644 tests/makefile delete mode 100644 tests/parser/makefile delete mode 100644 tests/roundtrip/makefile delete mode 100644 tests/serializer/makefile delete mode 100644 tests/template/Makefile.am delete mode 100644 tests/template/template-vc10.vcxproj delete mode 100644 tests/template/template-vc10.vcxproj.filters delete mode 100644 tests/template/template-vc11.vcxproj delete mode 100644 tests/template/template-vc11.vcxproj.filters delete mode 100644 tests/template/template-vc12.vcxproj delete mode 100644 tests/template/template-vc12.vcxproj.filters delete mode 100644 tests/template/template-vc9.vcproj delete mode 100644 tests/test.bat delete mode 100644 tests/tests-vc10.sln delete mode 100644 tests/tests-vc11.sln delete mode 100644 tests/tests-vc12.sln delete mode 100644 tests/tests-vc9.sln diff --git a/INSTALL b/INSTALL index d23e70b..7f65e33 100644 --- a/INSTALL +++ b/INSTALL @@ -1,86 +1,6 @@ -Building on UNIX -================ +The easiest way to build this package is with the bpkg package manager: -The following build instructions are for the Linux/UNIX/Mac OS X -operating systems as well as for Cygwin and MinGW on Windows. +$ bpkg build libstudxml -The standard autotools-based build system is used on these platforms. After -unpacking the source code archive, change to the libstudxml package directory -(referred to as libstudxml/ from now on) and run the configure script: - -./configure - -To see the available configuration options run configure with --help: - -./configure --help - -As an example, the following configure command only builds shared libraries, -uses the specified C++ compiler, and compiles with optimization and without -debug information: - -./configure --disable-static CXX=g++-4.9 CXXFLAGS=-O3 - -One configure option worth mentioning is --with-extern-expat. It makes -libstudxml use an external Expat library rather than bulding-in the -internal version. - -Once configuration is complete, run make to build libstudxml: - -make - -Once the build is completed successfully you can run the tests using -the check target: - -make check - -You can also install the libstudxml headers and libraries using the -install target (you may need to do this step as root depending on the -installation directory): - -make install - - -Building on Windows -=================== - -The following build instructions are for Windows using Microsoft Visual -Studio. If you would like to build libstudxml with GCC either using Cygwin -or MinGW, refer to the "Building on UNIX" section above. - -The standard Visual Studio project and solution files are used on this -platform. To build the libstudxml library, unpack the source code archive -and open the libstudxml-vc.sln file located in the libstudxml package -directory (referred to as libstudxml\ from now on). Here is the version -of Visual Studio that you are using. Once the solution is open, select -the desired build configuration (Debug or Release) and platform (Win32 -or x64) and build the solution. - -The resulting 32-bit DLLs and import libraries are placed into the -libstudxml\bin\ and libstudxml\lib\ directories, respectively. Similarly, -the 64-bit DLLs and import libraries are placed into libstudxml\bin64\ -and libstudxml\lib64\. The Release versions of the import libraries are -named studxml.lib and the Debug versions are named studxml-d.lib. - -To configure Visual Studio to automatically locate the libstudxml headers, -DLLs, and import libraries, add the following paths to your VC++ -Directories: - -Win32: - - Include: ...\libstudxml - Library: ...\libstudxml\lib - Executable: ...\libstudxml\bin - -x64: - - Include: ...\libstudxml - Library: ...\libstudxml\lib64 - Executable: ...\libstudxml\bin64 - -If you would like to build the libstudxml examples, also open and build -the solution in the examples/ subdirectory. Similarly, to built the tests, -open and build the solution in the tests/ subdirectory. - -While you can run the tests and examples manually, it is also possible -to run all the tests and all the examples automatically using the test.bat -batch files located in the examples\ and tests\ directories. +But if you don't want to use the package manager, then you can also build it +manually using the standard build2 build system. diff --git a/INSTALL-GIT b/INSTALL-GIT deleted file mode 100644 index 2c66aa0..0000000 --- a/INSTALL-GIT +++ /dev/null @@ -1,79 +0,0 @@ -The following instructions describe how to work with the source code that was -checked out from the git repository. - -The major difference between using a released source code package and source -code from the repository is that the former does not contain autotools-based -makefiles or Visual Studio project files. Instead, it contains templates for -these files as well as its own, custom build system. This build system is -used for development as well as to automatically generate the autotools and -Visual Studio files. - -This file describes how to use this build system to build the package as well -as to create a release-ready source distribution which contains the autotools -build system and Visual Studio project files. - - -Prerequisites -============= - -You will need the following additional packages to build from the git -repository: - - - GNU bash >= 2.0.0 http://www.gnu.org/software/bash/ - - GNU make >= 3.81 http://www.gnu.org/software/make/ - - build >= latest http://www.codesynthesis.com/projects/build/ - -If you are planning to create the source code distributions, then you will -also need the following packages: - - - GNU m4 >= 1.4.0 http://www.gnu.org/software/m4/ - - GNU sed >= 4.0.0 http://www.gnu.org/software/sed/ - - tofrodos >= 1.7.0 http://www.thefreecountry.com/tofrodos/ - -As we as the GNU autotools: - - - GNU libtool >= 2.2.6b http://www.gnu.org/software/libtool/ - - GNU autoconf >= 2.67 http://www.gnu.org/software/autoconf/ - - GNU automake >= 1.11.1 http://www.gnu.org/software/automake/ - -Any reasonably up to date GNU/Linux installation would normally have all of -the above packages already present, except for build and maybe tofrodos. - - -Configuring and Building -======================== - -To build the source code simply run make in the root directory of the package. -The first time you run make, the build process will also configure the -package by asking you several questions. On the subsequent runs, make will -only rebuild what has changed. - -To run the automated test suite, run 'make test'. To clean the object files, -executables, etc., run 'make clean'. To de-configure the package (that is, -to remove configuration files in addition to objects, executables, etc.), -run 'make disfigure'. - - -Creating Distribution -===================== - -To create the source code distribution, use the dist make target as well as -the dist_prefix variable to specify the directory where the distribution files -should be placed. For example: - -make dist dist_prefix=/tmp/libstudxml-1.0.0 - -Once the distribution files are ready, change to the distribution directory -and run the bootstrap script to bootstrap the autotools build system, for -example: - -cd /tmp/libstudxml-1.0.0 -./bootsrap - -To create the source code archives, use the autotools build system. First -configuring the package (see the INSTALL file for more information on this -step) and then use the dist (or distcheck) target to make the archives, for -example: - -./configure -make dist diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 2a5f97a..0000000 --- a/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# file : Makefile.am -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -SUBDIRS = __path__(dirs) -dist_doc_DATA = __file__(docs) -EXTRA_DIST = __file__(extra_dist) -ACLOCAL_AMFLAGS = -I m4 - -pkgconfigdir = @pkgconfigdir@ -pkgconfig_DATA= libstudxml.pc diff --git a/bootstrap b/bootstrap deleted file mode 100755 index 0270cdd..0000000 --- a/bootstrap +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh - -# file : bootstrap -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -# -# Bootstrap the automake build system. -# - -rm -f config.cache - -if test ! -d m4; then - mkdir m4 -fi - -autoreconf --install diff --git a/build/bootstrap.make b/build/bootstrap.make deleted file mode 100644 index 3bcae5a..0000000 --- a/build/bootstrap.make +++ /dev/null @@ -1,70 +0,0 @@ -# file : build/bootstrap.make -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -project_name := libstudxml - -# First try to include the bundled bootstrap.make if it exist. If that -# fails, let make search for the external bootstrap.make. -# -build := build-0.3 - --include $(dir $(lastword $(MAKEFILE_LIST)))../../$(build)/bootstrap.make - -ifeq ($(patsubst %build/bootstrap.make,,$(lastword $(MAKEFILE_LIST))),) -include $(build)/bootstrap.make -endif - -# Aliases -# -.PHONY: $(out_base)/ \ - $(out_base)/.test \ - $(out_base)/.dist \ - $(out_base)/.clean - -ifdef %interactive% - -.PHONY: test dist clean - -test: $(out_base)/.test -dist: $(out_base)/.dist -clean: $(out_base)/.clean - -ifneq ($(filter $(.DEFAULT_GOAL),test dist clean),) -.DEFAULT_GOAL := -endif - -endif - -# Make sure the distribution prefix is set if the goal is dist. -# -ifneq ($(filter $(MAKECMDGOALS),dist),) -ifeq ($(dist_prefix),) -$(error dist_prefix is not set) -endif -endif - -# If we don't have dependency auto-generation then we need to manually -# make sure that generated files are generated before C++ file are -# compiler. To do this we make the object files ($2) depend in order- -# only on generated files ($3). -# -ifeq ($(cxx_id),generic) - -define include-dep -$(if $2,$(eval $2: | $3)) -endef - -else - -define include-dep -$(call -include,$1) -endef - -endif - -# Don't include dependency info for certain targets. -# -ifneq ($(filter $(MAKECMDGOALS),clean disfigure dist),) -include-dep = -endif diff --git a/build/export/libstudxml/stub.make b/build/export/libstudxml/stub.make deleted file mode 100644 index 4ef7aa1..0000000 --- a/build/export/libstudxml/stub.make +++ /dev/null @@ -1,9 +0,0 @@ -# file : build/export/libstudxml/stub.make -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -$(call include-once,$(src_root)/xml/makefile,$(out_root)) - -$(call export,\ - l: $(out_root)/xml/studxml.l,\ - cpp-options: $(out_root)/xml/studxml.l.cpp-options) diff --git a/build/import/libstudxml/LICENSE b/build/import/libstudxml/LICENSE deleted file mode 120000 index 5853aae..0000000 --- a/build/import/libstudxml/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../LICENSE \ No newline at end of file diff --git a/build/import/libstudxml/configuration-rules.make b/build/import/libstudxml/configuration-rules.make deleted file mode 100644 index 26d91c2..0000000 --- a/build/import/libstudxml/configuration-rules.make +++ /dev/null @@ -1,14 +0,0 @@ -# file : build/import/libstudxml/configuration-rules.make -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -$(dcf_root)/import/libstudxml/configuration-dynamic.make: | $(dcf_root)/import/libstudxml/. - $(call message,,$(scf_root)/import/libstudxml/configure $@) - -ifndef %foreign% - -$(dcf_root)/.disfigure:: - $(call message,rm $(dcf_root)/import/libstudxml/configuration-dynamic.make,\ -rm -f $(dcf_root)/import/libstudxml/configuration-dynamic.make) - -endif diff --git a/build/import/libstudxml/configure b/build/import/libstudxml/configure deleted file mode 100755 index 3f52fdd..0000000 --- a/build/import/libstudxml/configure +++ /dev/null @@ -1,52 +0,0 @@ -#! /usr/bin/env bash - -# file : build/import/libstudxml/configure -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -# $1 - out file -# -# bld_root - build root -# project_name - project name -# - -source $bld_root/dialog.bash - -$echo -$echo "Configuring external dependency on 'libstudxml' for '$project_name'." -$echo - -$echo -$echo "Would you like to configure dependency on the installed " -$echo "version of 'libstudxml' as opposed to the development build?" -$echo - -installed=`read_y_n y` - -path= - -if [ "$installed" = "n" ]; then - -$echo -$echo "Please enter the src_root for 'libstudxml'." -$echo - -src_root=`read_path --directory --exist` - -$echo -$echo "Please enter the out_root for 'libstudxml'." -$echo - -out_root=`read_path --directory $src_root` - -fi - -echo libstudxml_installed := $installed >$1 - -if [ "$installed" = "n" ]; then - -echo src_root := $src_root >>$1 -echo scf_root := \$\(src_root\)/build >>$1 -echo out_root := $out_root >>$1 - -fi diff --git a/build/import/libstudxml/stub.make b/build/import/libstudxml/stub.make deleted file mode 100644 index eafa4c4..0000000 --- a/build/import/libstudxml/stub.make +++ /dev/null @@ -1,29 +0,0 @@ -# file : build/import/libstudxml/stub.make -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -$(call include-once,$(scf_root)/import/libstudxml/configuration-rules.make,$(dcf_root)) - -libstudxml_installed := - -$(call -include,$(dcf_root)/import/libstudxml/configuration-dynamic.make) - -ifdef libstudxml_installed - -ifeq ($(libstudxml_installed),y) - -$(call export,l: -lstudxml,cpp-options: ) - -else - -# Include export stub. -# -$(call include,$(scf_root)/export/libstudxml/stub.make) - -endif - -else - -.NOTPARALLEL: - -endif diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 7692424..0000000 --- a/configure.ac +++ /dev/null @@ -1,85 +0,0 @@ -# file : configure.ac -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -AC_PREREQ(2.60) -AC_INIT([libstudxml], [__value__(version)], [studxml-users@codesynthesis.com]) -AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([xml/exception]) - -AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc subdir-objects dist-bzip2 dist-zip tar-ustar]) -m4_equote()[m4_ifdef]m4_dquote()([AM_PROG_AR], [AM_PROG_AR]) # Required by automake 1.12. - -LT_INIT([win32-dll]) - -AC_CANONICAL_HOST - -# Check for diff. -# -DIFF_TOOL - -# Check for C++ compiler and use it to compile the tests. -# -AC_PROG_CXX -AC_LANG(C++) - -# Create the libtool executable so that we can use it in further tests. -# -LT_OUTPUT - -# Check if we need to use external Expat. -# -AC_MSG_CHECKING([if we should use external expat]) - -AC_ARG_WITH( - [external-expat], - [AC_HELP_STRING([--with-external-expat],[use external expat instead of the internal subset])], - [external_expat=${withval}], - [external_expat=no]) - -if test x"$external_expat" != xno; then - AC_MSG_RESULT([yes]) - - # Check if we have Expat. - # - expat_found=yes - LIBEXPAT([],[expat_found=no]) - - if test x"$expat_found" = xno; then - AC_MSG_ERROR([expat is not found; consider using CPPFLAGS/LDFLAGS to specify its location]) - fi - - AC_DEFINE([LIBSTUDXML_EXTERNAL_EXPAT], [1], [Use external expat.]) -else - AC_MSG_RESULT([no]) -fi - -AM_CONDITIONAL([LIBSTUDXML_EXTERNAL_EXPAT], [test x"$external_expat" != xno]) - -# If we have internal Expat, then determine the byteorder. -# -if test x"$external_expat" = xno; then - AC_C_BIGENDIAN([byteorder=4321], [byteorder=1234]) - AC_DEFINE_UNQUOTED([LIBSTUDXML_BYTEORDER], [$byteorder], [1234 = little, 4321 = big]) -fi - -# Define LIBSTUDXML_STATIC_LIB if we are build static library on certain -# platforms. -# -STATIC_LIB([LIBSTUDXML_STATIC_LIB], [Static library interface.]) - -# Allow the user to specify the pkgconfig directory. -# -PKGCONFIG - -# Check if we should disable rpath. -# -DISABLE_RPATH - -# Output. -# -AC_CONFIG_HEADERS([xml/config.h xml/details/config.h]) -AC_CONFIG_FILES([ __path__(config_files)]) -AC_CONFIG_COMMANDS([tester-mode], [chmod +x tester]) -AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index eb4438f..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# file : doc/Makefile.am -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -dist_html_DATA = __file__(html_docs) diff --git a/doc/makefile b/doc/makefile deleted file mode 100644 index 31b790d..0000000 --- a/doc/makefile +++ /dev/null @@ -1,18 +0,0 @@ -# file : doc/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make - -dist := $(out_base)/.dist - -# Dist. -# -$(dist): data_dist := default.css intro.xhtml -$(dist): export html_docs := $(data_dist) -$(dist): - $(call dist-data,$(html_docs)) - $(call meta-automake) - -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/automake.make) diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 756331f..0000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -# file : examples/Makefile.am -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -SUBDIRS = __path__(dirs) -EXTRA_DIST = __file__(extra_dist) diff --git a/examples/buildfile b/examples/buildfile index 7331d21..b14235a 100644 --- a/examples/buildfile +++ b/examples/buildfile @@ -2,8 +2,6 @@ # copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC # license : MIT; see accompanying LICENSE file -d = hybrid/ inheritance/ performance/ persistence/ processing/ roundtrip/ \ - xhtml/ +./: hybrid/ inheritance/ performance/ persistence/ processing/ roundtrip/ \ + xhtml/ doc{README} -./: $d doc{README} -include $d diff --git a/examples/examples-vc10.sln b/examples/examples-vc10.sln deleted file mode 100644 index 9a5dc32..0000000 --- a/examples/examples-vc10.sln +++ /dev/null @@ -1,15 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/examples/examples-vc11.sln b/examples/examples-vc11.sln deleted file mode 100644 index 436eeea..0000000 --- a/examples/examples-vc11.sln +++ /dev/null @@ -1,15 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/examples/examples-vc12.sln b/examples/examples-vc12.sln deleted file mode 100644 index 446d701..0000000 --- a/examples/examples-vc12.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/examples/examples-vc9.sln b/examples/examples-vc9.sln deleted file mode 100644 index 2ec9432..0000000 --- a/examples/examples-vc9.sln +++ /dev/null @@ -1,15 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/examples/hybrid/makefile b/examples/hybrid/makefile deleted file mode 100644 index 865ff8b..0000000 --- a/examples/hybrid/makefile +++ /dev/null @@ -1,90 +0,0 @@ -# file : examples/hybrid/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx dom.cxx - -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -$(dist): name := $(subst $(src_root)/examples/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): extras := README position.xml -$(dist): export extra_sources := $(filter-out driver.cxx,$(cxx_tun)) -$(dist): export extra_headers := dom.hxx -$(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources) $(extra_headers) $(extras)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - -# Test. -# -$(test): $(driver) - $(call message,test $<,$< $(src_base)/position.xml) - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/examples/inheritance/makefile b/examples/inheritance/makefile deleted file mode 100644 index 2174c03..0000000 --- a/examples/inheritance/makefile +++ /dev/null @@ -1,90 +0,0 @@ -# file : examples/inheritance/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx position.cxx - -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -$(dist): name := $(subst $(src_root)/examples/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): extras := README position.xml -$(dist): export extra_sources := $(filter-out driver.cxx,$(cxx_tun)) -$(dist): export extra_headers := position.hxx -$(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources) $(extra_headers) $(extras)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - -# Test. -# -$(test): $(driver) - $(call message,test $<,$< $(src_base)/position.xml) - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/examples/makefile b/examples/makefile deleted file mode 100644 index 51e517d..0000000 --- a/examples/makefile +++ /dev/null @@ -1,41 +0,0 @@ -# file : examples/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make - -examples := roundtrip processing persistence inheritance hybrid performance \ -xhtml - -default := $(out_base)/ -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(examples))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(examples))) - -$(dist): extras := README -$(dist): export dirs := $(examples) -$(dist): export extra_dist := $(extras) test.bat examples-vc9.sln \ -examples-vc10.sln examples-vc11.sln examples-vc12.sln -$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(examples))) - $(call dist-data,$(extras)) - $(call meta-automake) - $(call meta-vc9sln,examples-vc9.sln) - $(call meta-vc10sln,examples-vc10.sln) - $(call meta-vc11sln,examples-vc11.sln) - $(call meta-vc12sln,examples-vc12.sln) - $(call meta-vctest,examples-vc9.sln,test.bat) - -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(examples))) - -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9sln.make) -$(call include,$(bld_root)/meta/vc10sln.make) -$(call include,$(bld_root)/meta/vc11sln.make) -$(call include,$(bld_root)/meta/vc12sln.make) -$(call include,$(bld_root)/meta/vctest.make) -$(call include,$(bld_root)/meta/automake.make) - -$(foreach t,$(examples),$(call import,$(src_base)/$t/makefile)) diff --git a/examples/performance/makefile b/examples/performance/makefile deleted file mode 100644 index bd28c17..0000000 --- a/examples/performance/makefile +++ /dev/null @@ -1,90 +0,0 @@ -# file : examples/performance/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx time.cxx - -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -$(dist): name := $(subst $(src_root)/examples/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): extras := README gen.cxx expat.cxx test.xsd test-50k.xml -$(dist): export extra_sources := $(filter-out driver.cxx,$(cxx_tun)) -$(dist): export extra_headers := time.hxx -$(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources) $(extra_headers) $(extras)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - -# Test. -# -$(test): $(driver) - $(call message,test $<,$< $(src_base)/test-50k.xml) - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/examples/persistence/makefile b/examples/persistence/makefile deleted file mode 100644 index 10abe3d..0000000 --- a/examples/persistence/makefile +++ /dev/null @@ -1,90 +0,0 @@ -# file : examples/persistence/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx position.cxx - -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -$(dist): name := $(subst $(src_root)/examples/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): extras := README position.xml -$(dist): export extra_sources := $(filter-out driver.cxx,$(cxx_tun)) -$(dist): export extra_headers := position.hxx -$(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources) $(extra_headers) $(extras)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - -# Test. -# -$(test): $(driver) - $(call message,test $<,$< $(src_base)/position.xml) - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/examples/processing/makefile b/examples/processing/makefile deleted file mode 100644 index 283dea5..0000000 --- a/examples/processing/makefile +++ /dev/null @@ -1,88 +0,0 @@ -# file : examples/processing/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx - -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -$(dist): name := $(subst $(src_root)/examples/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): extras := README position.xml -$(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources) $(extras)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - -# Test. -# -$(test): $(driver) - $(call message,test $<,$< $(src_base)/position.xml) - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/examples/roundtrip/makefile b/examples/roundtrip/makefile deleted file mode 100644 index 07cd75e..0000000 --- a/examples/roundtrip/makefile +++ /dev/null @@ -1,88 +0,0 @@ -# file : examples/roundtrip/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx - -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -$(dist): name := $(subst $(src_root)/examples/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): extras := README position.xml -$(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources) $(extras)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - -# Test. -# -$(test): $(driver) - $(call message,test $<,$< $(src_base)/position.xml) - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/examples/template/Makefile.am b/examples/template/Makefile.am deleted file mode 100644 index 37d9509..0000000 --- a/examples/template/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# file : examples/template/Makefile.am -# copyright : not copyrighted - public domain - -EXTRA_DIST = __file__(extra_dist) - -noinst_PROGRAMS = driver -driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers) -LDADD = $(top_builddir)/xml/libstudxml.la - -AM_CPPFLAGS = -I'$(top_builddir)' -I'$(top_srcdir)' - -TESTS=$(top_builddir)/tester -TESTS_ENVIRONMENT=example=1; export example; - -# Make sure make doesn't try to build the no-extension headers -# thinking that they are executable. Those are pulled in through -# auto-generated dependencies. -# -__foreach_w__(__f,__path__(xml_headers),$(top_srcdir)/xml/__f ): ; @: diff --git a/examples/template/template-vc10.vcxproj b/examples/template/template-vc10.vcxproj deleted file mode 100644 index 402aa6d..0000000 --- a/examples/template/template-vc10.vcxproj +++ /dev/null @@ -1,167 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {__uuid__()} - Win32Proj - __value__(name) - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - $(Configuration)\ - driver - - - true - $(Platform)\$(Configuration)\ - driver - - - false - $(Configuration)\ - driver - - - false - $(Platform)\$(Configuration)\ - driver - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - -__header_entries__(extra_headers) - - -__source_entry__(driver.cxx) -__source_entries__(extra_sources) - - - - - diff --git a/examples/template/template-vc10.vcxproj.filters b/examples/template/template-vc10.vcxproj.filters deleted file mode 100644 index 6d459fa..0000000 --- a/examples/template/template-vc10.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {__uuid__()} - cxx - - - {__uuid__()} - h;hxx;ixx;txx - - - -__header_filter_entries__(extra_headers) - - -__source_filter_entry__(driver.cxx) -__source_filter_entries__(extra_sources) - - diff --git a/examples/template/template-vc11.vcxproj b/examples/template/template-vc11.vcxproj deleted file mode 100644 index 095038b..0000000 --- a/examples/template/template-vc11.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {__uuid__()} - Win32Proj - __value__(name) - - - - Application - true - v110 - Unicode - - - Application - true - v110 - Unicode - - - Application - false - v110 - true - Unicode - - - Application - false - v110 - true - Unicode - - - - - - - - - - - - - - - - - - - true - $(Configuration)\ - driver - - - true - $(Platform)\$(Configuration)\ - driver - - - false - $(Configuration)\ - driver - - - false - $(Platform)\$(Configuration)\ - driver - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - -__header_entries__(extra_headers) - - -__source_entry__(driver.cxx) -__source_entries__(extra_sources) - - - - - diff --git a/examples/template/template-vc11.vcxproj.filters b/examples/template/template-vc11.vcxproj.filters deleted file mode 100644 index 6d459fa..0000000 --- a/examples/template/template-vc11.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {__uuid__()} - cxx - - - {__uuid__()} - h;hxx;ixx;txx - - - -__header_filter_entries__(extra_headers) - - -__source_filter_entry__(driver.cxx) -__source_filter_entries__(extra_sources) - - diff --git a/examples/template/template-vc12.vcxproj b/examples/template/template-vc12.vcxproj deleted file mode 100644 index 6e7c2c9..0000000 --- a/examples/template/template-vc12.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {__uuid__()} - Win32Proj - __value__(name) - - - - Application - true - v120 - Unicode - - - Application - true - v120 - Unicode - - - Application - false - v120 - true - Unicode - - - Application - false - v120 - true - Unicode - - - - - - - - - - - - - - - - - - - true - $(Configuration)\ - driver - - - true - $(Platform)\$(Configuration)\ - driver - - - false - $(Configuration)\ - driver - - - false - $(Platform)\$(Configuration)\ - driver - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - true - - - $(SolutionDir)\..\lib\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - true - - - $(SolutionDir)\..\lib64\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - true - - - $(SolutionDir)\..\lib\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - true - - - $(SolutionDir)\..\lib64\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - -__header_entries__(extra_headers) - - -__source_entry__(driver.cxx) -__source_entries__(extra_sources) - - - - - diff --git a/examples/template/template-vc12.vcxproj.filters b/examples/template/template-vc12.vcxproj.filters deleted file mode 100644 index 6d459fa..0000000 --- a/examples/template/template-vc12.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {__uuid__()} - cxx - - - {__uuid__()} - h;hxx;ixx;txx - - - -__header_filter_entries__(extra_headers) - - -__source_filter_entry__(driver.cxx) -__source_filter_entries__(extra_sources) - - diff --git a/examples/template/template-vc9.vcproj b/examples/template/template-vc9.vcproj deleted file mode 100644 index c4a1d64..0000000 --- a/examples/template/template-vc9.vcproj +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -__source_entry__(driver.cxx) -__source_entries__(extra_sources) - - -__file_entries__(extra_headers) - - - - - diff --git a/examples/test.bat b/examples/test.bat deleted file mode 100644 index 559b9e4..0000000 --- a/examples/test.bat +++ /dev/null @@ -1,74 +0,0 @@ -@echo off -rem file : examples/test.bat -rem copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -rem license : MIT; see accompanying LICENSE file - -setlocal - -set "tests=__path__(dirs)" -set "confs=__path__(configurations)" -set "plats=__path__(platforms)" -set "curdir=%CD%" -set "topdir=%curdir%\.." -set "failed=" - -goto start - -rem -rem %1 - test directory -rem %2 - configuration -rem %3 - platform -rem -:run_test - cd %1 - - if "_%3_" == "_Win32_" ( - set "dir=%2" - ) else ( - set "dir=%3\%2" - ) - - if exist %dir%\driver.exe ( - echo %1\%3\%2 - call %topdir%\tester.bat example %2 %3 - if errorlevel 1 ( - set "failed=%failed% %1\%3\%2" - ) - ) - - cd %curdir% -goto :eof - -:start - -for %%t in (%tests%) do ( - for %%c in (%confs%) do ( - for %%p in (%plats%) do ( - call :run_test %%t %%c %%p - ) - ) -) - -if not "_%failed%_" == "__" goto error - -echo. -echo ALL EXAMPLES PASSED -echo. -goto end - -:usage -echo. -echo usage: test.bat -echo. - -:error -if not "_%failed%_" == "__" ( - echo. - for %%t in (%failed%) do echo FAILED: %%t - echo. -) -endlocal -exit /b 1 - -:end -endlocal diff --git a/examples/xhtml/makefile b/examples/xhtml/makefile deleted file mode 100644 index a5866a8..0000000 --- a/examples/xhtml/makefile +++ /dev/null @@ -1,88 +0,0 @@ -# file : examples/xhtml/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx - -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -$(dist): name := $(subst $(src_root)/examples/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): extras := README -$(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources) $(extras)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/libstudxml-vc10.sln b/libstudxml-vc10.sln deleted file mode 100644 index 0e065f4..0000000 --- a/libstudxml-vc10.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstudxml", "xml\libstudxml-vc10.vcxproj", "{DCFCED35-A6E4-4554-948D-4A5E982D6824}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DCFCED35-A6E4-4554-948D-4A5E982D6824}.Debug|Win32.ActiveCfg = Debug|Win32 - {DCFCED35-A6E4-4554-948D-4A5E982D6824}.Debug|Win32.Build.0 = Debug|Win32 - {DCFCED35-A6E4-4554-948D-4A5E982D6824}.Debug|x64.ActiveCfg = Debug|x64 - {DCFCED35-A6E4-4554-948D-4A5E982D6824}.Debug|x64.Build.0 = Debug|x64 - {DCFCED35-A6E4-4554-948D-4A5E982D6824}.Release|Win32.ActiveCfg = Release|Win32 - {DCFCED35-A6E4-4554-948D-4A5E982D6824}.Release|Win32.Build.0 = Release|Win32 - {DCFCED35-A6E4-4554-948D-4A5E982D6824}.Release|x64.ActiveCfg = Release|x64 - {DCFCED35-A6E4-4554-948D-4A5E982D6824}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libstudxml-vc11.sln b/libstudxml-vc11.sln deleted file mode 100644 index eb17a7d..0000000 --- a/libstudxml-vc11.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstudxml", "xml\libstudxml-vc11.vcxproj", "{518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB}.Debug|Win32.ActiveCfg = Debug|Win32 - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB}.Debug|Win32.Build.0 = Debug|Win32 - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB}.Debug|x64.ActiveCfg = Debug|x64 - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB}.Debug|x64.Build.0 = Debug|x64 - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB}.Release|Win32.ActiveCfg = Release|Win32 - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB}.Release|Win32.Build.0 = Release|Win32 - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB}.Release|x64.ActiveCfg = Release|x64 - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libstudxml-vc12.sln b/libstudxml-vc12.sln deleted file mode 100644 index df9496e..0000000 --- a/libstudxml-vc12.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstudxml", "xml\libstudxml-vc12.vcxproj", "{26482FB9-45CC-4188-8CA1-B86456967F47}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {26482FB9-45CC-4188-8CA1-B86456967F47}.Debug|Win32.ActiveCfg = Debug|Win32 - {26482FB9-45CC-4188-8CA1-B86456967F47}.Debug|Win32.Build.0 = Debug|Win32 - {26482FB9-45CC-4188-8CA1-B86456967F47}.Debug|x64.ActiveCfg = Debug|x64 - {26482FB9-45CC-4188-8CA1-B86456967F47}.Debug|x64.Build.0 = Debug|x64 - {26482FB9-45CC-4188-8CA1-B86456967F47}.Release|Win32.ActiveCfg = Release|Win32 - {26482FB9-45CC-4188-8CA1-B86456967F47}.Release|Win32.Build.0 = Release|Win32 - {26482FB9-45CC-4188-8CA1-B86456967F47}.Release|x64.ActiveCfg = Release|x64 - {26482FB9-45CC-4188-8CA1-B86456967F47}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libstudxml-vc9.sln b/libstudxml-vc9.sln deleted file mode 100644 index 3c6f54f..0000000 --- a/libstudxml-vc9.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstudxml", "xml\libstudxml-vc9.vcproj", "{93C99089-F2BB-4D66-9166-78002EC65C51}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {93C99089-F2BB-4D66-9166-78002EC65C51}.Debug|Win32.ActiveCfg = Debug|Win32 - {93C99089-F2BB-4D66-9166-78002EC65C51}.Debug|Win32.Build.0 = Debug|Win32 - {93C99089-F2BB-4D66-9166-78002EC65C51}.Debug|x64.ActiveCfg = Debug|x64 - {93C99089-F2BB-4D66-9166-78002EC65C51}.Debug|x64.Build.0 = Debug|x64 - {93C99089-F2BB-4D66-9166-78002EC65C51}.Release|Win32.ActiveCfg = Release|Win32 - {93C99089-F2BB-4D66-9166-78002EC65C51}.Release|Win32.Build.0 = Release|Win32 - {93C99089-F2BB-4D66-9166-78002EC65C51}.Release|x64.ActiveCfg = Release|x64 - {93C99089-F2BB-4D66-9166-78002EC65C51}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libstudxml.pc.in b/libstudxml.pc.in deleted file mode 100644 index d325669..0000000 --- a/libstudxml.pc.in +++ /dev/null @@ -1,15 +0,0 @@ -# file : libstudxml.pc.in -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libstudxml -Description: C++ XML library -URL: http://www.codesynthesis.com/projects/libstudxml/ -Version: @VERSION@ -Libs: -L${libdir} -lstudxml -Cflags: -I${includedir} diff --git a/libstudxml/Makefile.am b/libstudxml/Makefile.am deleted file mode 100644 index 531d456..0000000 --- a/libstudxml/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# file : xml/Makefile.am -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -EXTRA_DIST = __file__(extra_dist) - -studxmlincludedir = $(includedir)/xml - -lib_LTLIBRARIES = libstudxml.la -libstudxml_la_SOURCES = __path__(sources) - -nobase_studxmlinclude_HEADERS = __path__(headers) -nobase_nodist_studxmlinclude_HEADERS = details/config.h - -if !LIBSTUDXML_EXTERNAL_EXPAT -libstudxml_la_SOURCES += __path__(expat_sources) -nobase_studxmlinclude_HEADERS += __path__(expat_headers) -endif - -libstudxml_la_SOURCES += __path__(genx_sources) -nobase_studxmlinclude_HEADERS += __path__(genx_headers) - -nobase_studxmlinclude_HEADERS += __path__(xml_headers) - -# Make sure make doesn't try to build the no-extension headers -# thinking that they are executable. -# -__foreach_w__(__f,__path__(xml_headers),__f $(top_srcdir)/xml/__f ): ; @: - -AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -DLIBSTUDXML_DYNAMIC_LIB -AM_LDFLAGS = -release __value__(interface_version) -no-undefined diff --git a/libstudxml/buildfile b/libstudxml/buildfile index 1cc0203..668de68 100644 --- a/libstudxml/buildfile +++ b/libstudxml/buildfile @@ -15,8 +15,8 @@ lib{studxml}: \ details/{hxx }{ export.hxx } \ details/{hxx }{ post.hxx } \ details/{hxx }{ pre.hxx } \ -details/build2/{h }{ config } \ -details/build2/{h }{ config-vc } + details/{h }{ config } \ + details/{h }{ config-vc } # Expat. Note that we treat a whole bunch of its sources as files since they # are private and #include's (including .c file). @@ -60,11 +60,11 @@ else # We are a mixed C/C++ library, though C is implementatio-only, kind of: we # need headers but not symbols. # -cc.poptions =+ "-I$out_root" "-I$src_root" -DLIBSTUDXML_BUILD2 +cc.poptions =+ "-I$out_root" "-I$src_root" obja{*}: cc.poptions += -DLIBSTUDXML_STATIC_BUILD objs{*}: cc.poptions += -DLIBSTUDXML_SHARED_BUILD -lib{studxml}: cc.export.poptions = "-I$out_root" "-I$src_root" -DLIBSTUDXML_BUILD2 +lib{studxml}: cc.export.poptions = "-I$out_root" "-I$src_root" liba{studxml}: cc.export.poptions += -DLIBSTUDXML_STATIC libs{studxml}: cc.export.poptions += -DLIBSTUDXML_SHARED @@ -73,19 +73,3 @@ libs{studxml}: cc.export.poptions += -DLIBSTUDXML_SHARED # install.include = $install.include/libstudxml/ install.include.subdirs = true # Recreate subdirectories. - -# We want these to be picked up even when LIBSTUDXML_BUILD2 is not defined. -# -details/build2/: -{ - if ($cxx.id == "msvc") - { - h{config}@./: install = false - h{config-vc}@./: install = $install.include/details/ - } - else - { - h{config}@./: install = $install.include/details/ - h{config-vc}@./: install = false - } -} diff --git a/libstudxml/details/build2/config-vc.h b/libstudxml/details/build2/config-vc.h deleted file mode 100644 index f54ad58..0000000 --- a/libstudxml/details/build2/config-vc.h +++ /dev/null @@ -1,20 +0,0 @@ -/* file : libstudxml/details/build2/config-vc.h - * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC - * license : MIT; see accompanying LICENSE file - */ - -/* Configuration file for Windows/VC++ for the build2 build. */ - -#ifndef LIBSTUDXML_DETAILS_CONFIG_VC_H -#define LIBSTUDXML_DETAILS_CONFIG_VC_H - -/* Define LIBSTUDXML_BUILD2 for the installed case. */ -#ifndef LIBSTUDXML_BUILD2 -# define LIBSTUDXML_BUILD2 -#endif - -// Always little-endian, at least on i686 and x86_64. -// -#define LIBSTUDXML_BYTEORDER 1234 - -#endif /* LIBSTUDXML_DETAILS_CONFIG_VC_H */ diff --git a/libstudxml/details/build2/config.h b/libstudxml/details/build2/config.h deleted file mode 100644 index b47f252..0000000 --- a/libstudxml/details/build2/config.h +++ /dev/null @@ -1,45 +0,0 @@ -/* file : libstudxml/details/build2/config.h - * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC - * license : MIT; see accompanying LICENSE file - */ - -/* Static configuration file for the build2 build. */ - -#ifndef LIBSTUDXML_DETAILS_CONFIG_H -#define LIBSTUDXML_DETAILS_CONFIG_H - -/* Define LIBSTUDXML_BUILD2 for the installed case. */ -#ifndef LIBSTUDXML_BUILD2 -# define LIBSTUDXML_BUILD2 -#endif - -#ifdef __FreeBSD__ -# include /* BYTE_ORDER */ -#else -# if defined(_WIN32) -# ifndef BYTE_ORDER -# define BIG_ENDIAN 4321 -# define LITTLE_ENDIAN 1234 -# define BYTE_ORDER LITTLE_ENDIAN -# endif -# else -# include /* BYTE_ORDER/__BYTE_ORDER */ -# ifndef BYTE_ORDER -# ifdef __BYTE_ORDER -# define BYTE_ORDER __BYTE_ORDER -# define BIG_ENDIAN __BIG_ENDIAN -# define LITTLE_ENDIAN __LITTLE_ENDIAN -# else -# error no BYTE_ORDER/__BYTE_ORDER define -# endif -# endif -# endif -#endif - -#if BYTE_ORDER == BIG_ENDIAN -# define LIBSTUDXML_BYTEORDER 4321 -#else -# define LIBSTUDXML_BYTEORDER 1234 -#endif - -#endif /* LIBSTUDXML_DETAILS_CONFIG_H */ diff --git a/libstudxml/details/config-vc.h b/libstudxml/details/config-vc.h index 7528b0e..3c2f9ab 100644 --- a/libstudxml/details/config-vc.h +++ b/libstudxml/details/config-vc.h @@ -3,11 +3,13 @@ * license : MIT; see accompanying LICENSE file */ -/* Configuration file for Windows/VC++. */ +/* Configuration file for Windows/VC++ for the build2 build. */ #ifndef LIBSTUDXML_DETAILS_CONFIG_VC_H #define LIBSTUDXML_DETAILS_CONFIG_VC_H +// Always little-endian, at least on i686 and x86_64. +// #define LIBSTUDXML_BYTEORDER 1234 #endif /* LIBSTUDXML_DETAILS_CONFIG_VC_H */ diff --git a/libstudxml/details/config.h b/libstudxml/details/config.h new file mode 100644 index 0000000..b31aa2d --- /dev/null +++ b/libstudxml/details/config.h @@ -0,0 +1,40 @@ +/* file : libstudxml/details/build2/config.h + * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC + * license : MIT; see accompanying LICENSE file + */ + +/* Static configuration file for the build2 build. */ + +#ifndef LIBSTUDXML_DETAILS_CONFIG_H +#define LIBSTUDXML_DETAILS_CONFIG_H + +#ifdef __FreeBSD__ +# include /* BYTE_ORDER */ +#else +# if defined(_WIN32) +# ifndef BYTE_ORDER +# define BIG_ENDIAN 4321 +# define LITTLE_ENDIAN 1234 +# define BYTE_ORDER LITTLE_ENDIAN +# endif +# else +# include /* BYTE_ORDER/__BYTE_ORDER */ +# ifndef BYTE_ORDER +# ifdef __BYTE_ORDER +# define BYTE_ORDER __BYTE_ORDER +# define BIG_ENDIAN __BIG_ENDIAN +# define LITTLE_ENDIAN __LITTLE_ENDIAN +# else +# error no BYTE_ORDER/__BYTE_ORDER define +# endif +# endif +# endif +#endif + +#if BYTE_ORDER == BIG_ENDIAN +# define LIBSTUDXML_BYTEORDER 4321 +#else +# define LIBSTUDXML_BYTEORDER 1234 +#endif + +#endif /* LIBSTUDXML_DETAILS_CONFIG_H */ diff --git a/libstudxml/details/config.h.in b/libstudxml/details/config.h.in deleted file mode 100644 index 83b633c..0000000 --- a/libstudxml/details/config.h.in +++ /dev/null @@ -1,15 +0,0 @@ -/* file : libstudxml/details/config.h.in - * copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC - * license : MIT; see accompanying LICENSE file - */ - -/* This file is automatically processed by configure. */ - -#ifndef LIBSTUDXML_DETAILS_CONFIG_H -#define LIBSTUDXML_DETAILS_CONFIG_H - -#undef LIBSTUDXML_STATIC_LIB -#undef LIBSTUDXML_EXTERNAL_EXPAT -#undef LIBSTUDXML_BYTEORDER - -#endif /* LIBSTUDXML_DETAILS_CONFIG_H */ diff --git a/libstudxml/details/config.hxx b/libstudxml/details/config.hxx index 68b9dbd..d42d2cf 100644 --- a/libstudxml/details/config.hxx +++ b/libstudxml/details/config.hxx @@ -31,20 +31,10 @@ # define STUDXML_NOTHROW_NOEXCEPT throw() #endif -// Note: the same in expat/config.h -// -#ifdef LIBSTUDXML_BUILD2 -# ifdef _MSC_VER -# include -# else -# include -# endif +#ifdef _MSC_VER +# include #else -# ifdef _MSC_VER -# include -# else -# include -# endif +# include #endif #endif // LIBSTUDXML_DETAILS_CONFIG_HXX diff --git a/libstudxml/details/expat/config.h b/libstudxml/details/expat/config.h index f76e6d8..99fa673 100644 --- a/libstudxml/details/expat/config.h +++ b/libstudxml/details/expat/config.h @@ -1,18 +1,10 @@ #ifndef EXPAT_CONFIG_H #define EXPAT_CONFIG_H -#ifdef LIBSTUDXML_BUILD2 -# ifdef _MSC_VER -# include -# else -# include -# endif +#ifdef _MSC_VER +# include #else -# ifdef _MSC_VER -# include -# else -# include -# endif +# include #endif #define BYTEORDER LIBSTUDXML_BYTEORDER diff --git a/libstudxml/details/export.hxx b/libstudxml/details/export.hxx index 9c8ced7..b4a385e 100644 --- a/libstudxml/details/export.hxx +++ b/libstudxml/details/export.hxx @@ -5,8 +5,6 @@ #ifndef LIBSTUDXML_DETAILS_EXPORT_HXX #define LIBSTUDXML_DETAILS_EXPORT_HXX -#include - // Normally we don't export class templates (but do complete specializations), // inline functions, and classes with only inline member functions. Exporting // classes that inherit from non-exported/imported bases (e.g., std::string) @@ -15,8 +13,6 @@ // used before their inline definition. The workaround is to reorder code. In // the end it's all trial and error. -#ifdef LIBSTUDXML_BUILD2 - #if defined(LIBSTUDXML_STATIC) // Using static. # define LIBSTUDXML_EXPORT #elif defined(LIBSTUDXML_STATIC_BUILD) // Building static. @@ -42,34 +38,4 @@ # define LIBSTUDXML_EXPORT // Using static or shared. #endif -#else // LIBSTUDXML_BUILD2 - -#ifdef LIBSTUDXML_STATIC_LIB -# define LIBSTUDXML_EXPORT -#else -# ifdef _WIN32 -# ifdef _MSC_VER -# ifdef LIBSTUDXML_DYNAMIC_LIB -# define LIBSTUDXML_EXPORT __declspec(dllexport) -# else -# define LIBSTUDXML_EXPORT __declspec(dllimport) -# endif -# else -# ifdef LIBSTUDXML_DYNAMIC_LIB -# ifdef DLL_EXPORT -# define LIBSTUDXML_EXPORT __declspec(dllexport) -# else -# define LIBSTUDXML_EXPORT -# endif -# else -# define LIBSTUDXML_EXPORT __declspec(dllimport) -# endif -# endif -# else -# define LIBSTUDXML_EXPORT -# endif -#endif - -#endif // LIBSTUDXML_BUILD2 - #endif // LIBSTUDXML_DETAILS_EXPORT_HXX diff --git a/libstudxml/libstudxml-vc10.vcxproj b/libstudxml/libstudxml-vc10.vcxproj deleted file mode 100644 index 5a49c39..0000000 --- a/libstudxml/libstudxml-vc10.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {DCFCED35-A6E4-4554-948D-4A5E982D6824} - Win32Proj - libstudxml - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - ..\bin\ - studxml-d-__value__(interface_version)-vc10 - - - true - ..\bin64\ - studxml-d-__value__(interface_version)-vc10 - - - false - ..\bin\ - studxml-__value__(interface_version)-vc10 - - - false - ..\bin64\ - studxml-__value__(interface_version)-vc10 - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib\studxml-d.lib - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib64\studxml-d.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib\studxml.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib64\studxml.lib - - - -__header_entries__(headers) -__header_entries__(expat_headers) -__header_entries__(genx_headers) -__header_entry__(details\config-vc.h) - - -__source_entries__(sources) -__source_entries__(expat_sources) -__source_entries__(genx_sources) - - - - - diff --git a/libstudxml/libstudxml-vc10.vcxproj.filters b/libstudxml/libstudxml-vc10.vcxproj.filters deleted file mode 100644 index 8f90e39..0000000 --- a/libstudxml/libstudxml-vc10.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - {51AEF41C-865B-40D5-89C8-151CE797B6C4} - c;cxx - - - {06415D1D-41F6-4BA3-A026-126239CCD920} - h;hxx;ixx;txx - - - -__header_filter_entries__(headers) -__header_filter_entries__(expat_headers) -__header_filter_entries__(genx_headers) -__header_filter_entry__(details\config-vc.h) - - -__source_filter_entries__(sources) -__source_filter_entries__(expat_sources) -__source_filter_entries__(genx_sources) - - diff --git a/libstudxml/libstudxml-vc11.vcxproj b/libstudxml/libstudxml-vc11.vcxproj deleted file mode 100644 index 54b59a2..0000000 --- a/libstudxml/libstudxml-vc11.vcxproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {518885FE-EDEC-494D-A3FA-CBEAC9A7FCBB} - Win32Proj - libstudxml - - - - DynamicLibrary - true - v110 - Unicode - - - DynamicLibrary - true - v110 - Unicode - - - DynamicLibrary - false - v110 - true - Unicode - - - DynamicLibrary - false - v110 - true - Unicode - - - - - - - - - - - - - - - - - - - true - ..\bin\ - studxml-d-__value__(interface_version)-vc11 - - - true - ..\bin64\ - studxml-d-__value__(interface_version)-vc11 - - - false - ..\bin\ - studxml-__value__(interface_version)-vc11 - - - false - ..\bin64\ - studxml-__value__(interface_version)-vc11 - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib\studxml-d.lib - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib64\studxml-d.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib\studxml.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib64\studxml.lib - - - -__header_entries__(headers) -__header_entries__(expat_headers) -__header_entries__(genx_headers) -__header_entry__(details\config-vc.h) - - -__source_entries__(sources) -__source_entries__(expat_sources) -__source_entries__(genx_sources) - - - - - diff --git a/libstudxml/libstudxml-vc11.vcxproj.filters b/libstudxml/libstudxml-vc11.vcxproj.filters deleted file mode 100644 index 9b77026..0000000 --- a/libstudxml/libstudxml-vc11.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - {8EC23642-5CC3-4086-92C9-AE14E512CA6C} - c;cxx - - - {8CB2105E-BD73-4B1B-8DCE-E1FCB9B4D894} - h;hxx;ixx;txx - - - -__header_filter_entries__(headers) -__header_filter_entries__(expat_headers) -__header_filter_entries__(genx_headers) -__header_filter_entry__(details\config-vc.h) - - -__source_filter_entries__(sources) -__source_filter_entries__(expat_sources) -__source_filter_entries__(genx_sources) - - diff --git a/libstudxml/libstudxml-vc12.vcxproj b/libstudxml/libstudxml-vc12.vcxproj deleted file mode 100644 index 664bb19..0000000 --- a/libstudxml/libstudxml-vc12.vcxproj +++ /dev/null @@ -1,179 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {26482FB9-45CC-4188-8CA1-B86456967F47} - Win32Proj - libstudxml - - - - DynamicLibrary - true - v120 - Unicode - - - DynamicLibrary - true - v120 - Unicode - - - DynamicLibrary - false - v120 - true - Unicode - - - DynamicLibrary - false - v120 - true - Unicode - - - - - - - - - - - - - - - - - - - true - ..\bin\ - studxml-d-__value__(interface_version)-vc12 - - - true - ..\bin64\ - studxml-d-__value__(interface_version)-vc12 - - - false - ..\bin\ - studxml-__value__(interface_version)-vc12 - - - false - ..\bin64\ - studxml-__value__(interface_version)-vc12 - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib\studxml-d.lib - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - $(TargetPath) - ..\lib64\studxml-d.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib\studxml.lib - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSTUDXML_DYNAMIC_LIB;%(PreprocessorDefinitions) - .. - 4355;4800;4290;4251;%(DisableSpecificWarnings) - - - Windows - true - true - true - $(TargetPath) - ..\lib64\studxml.lib - - - -__header_entries__(headers) -__header_entries__(expat_headers) -__header_entries__(genx_headers) -__header_entry__(details\config-vc.h) - - -__source_entries__(sources) -__source_entries__(expat_sources) -__source_entries__(genx_sources) - - - - - diff --git a/libstudxml/libstudxml-vc12.vcxproj.filters b/libstudxml/libstudxml-vc12.vcxproj.filters deleted file mode 100644 index b6093d3..0000000 --- a/libstudxml/libstudxml-vc12.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - {B3C787E6-B23A-41BB-BF39-DFD42DEE8FDA} - c;cxx - - - {90BC2EB8-E1F4-4ADA-AD98-FB8727184CAA} - h;hxx;ixx;txx - - - -__header_filter_entries__(headers) -__header_filter_entries__(expat_headers) -__header_filter_entries__(genx_headers) -__header_filter_entry__(details\config-vc.h) - - -__source_filter_entries__(sources) -__source_filter_entries__(expat_sources) -__source_filter_entries__(genx_sources) - - diff --git a/libstudxml/libstudxml-vc9.vcproj b/libstudxml/libstudxml-vc9.vcproj deleted file mode 100644 index 5502ab7..0000000 --- a/libstudxml/libstudxml-vc9.vcproj +++ /dev/null @@ -1,360 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -__source_entries__(sources) -__source_entries__(expat_sources) -__source_entries__(genx_sources) - - -__file_entries__(headers) -__file_entries__(expat_headers) -__file_entries__(genx_headers) -__file_entry__(details\config-vc.h) - - - - - diff --git a/libstudxml/makefile b/libstudxml/makefile deleted file mode 100644 index ca9d63c..0000000 --- a/libstudxml/makefile +++ /dev/null @@ -1,143 +0,0 @@ -# file : xml/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make - -sources := qname.cxx parser.cxx serializer.cxx value-traits.cxx -xml_headers := content exception forward qname parser serializer value-traits \ -version - -# Expat. -# -expat_sources := xmlparse.c xmlrole.c xmltok.c -expat_headers := expat.h expat_external.h -expat_dist := ascii.h asciitab.h config.h iasciitab.h internal.h \ -latin1tab.h nametab.h utf8tab.h xmlrole.h xmltok.h xmltok_impl.c \ -xmltok_impl.h xmltok_ns.c README LICENSE - -expat_sources := $(addprefix details/expat/,$(expat_sources)) -expat_headers := $(addprefix details/expat/,$(expat_headers)) -expat_dist := $(addprefix details/expat/,$(expat_dist)) - -# Genx. -# -genx_sources := details/genx/genx.c details/genx/char-props.c -genx_headers := details/genx/genx.h -genx_dist := details/genx/README details/genx/LICENSE - -c_tun := $(expat_sources) $(genx_sources) -c_obj := $(addprefix $(out_base)/,$(c_tun:.c=.o)) -c_od := $(c_obj:.o=.o.d) - -cxx_tun := $(sources) -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_base)/studxml.l -studxml.l.cpp-options := $(out_base)/studxml.l.cpp-options - -default := $(out_base)/ -dist := $(out_base)/.dist -install := $(out_base)/.install -clean := $(out_base)/.clean - -# Build. -# -$(studxml.l): $(c_obj) $(cxx_obj) - -$(c_obj) $(cxx_obj) $(c_od) $(cxx_od): $(studxml.l.cpp-options) \ - $(out_base)/details/config.h -$(studxml.l.cpp-options): value := -I$(out_root) -I$(src_root) - -$(call include,$(bld_root)/ld/configuration-lib.make) # ld_lib_type - -$(out_base)/details/config.h: | $(out_base)/details/. - @echo '/* file : xml/details/config.h' >$@ - @echo ' * note : automatically generated' >>$@ - @echo ' */' >>$@ - @echo '#ifndef XML_DETAILS_CONFIG_H' >>$@ - @echo '#define XML_DETAILS_CONFIG_H' >>$@ - @echo '' >>$@ - @echo '#define LIBSTUDXML_BYTEORDER 1234' >>$@ -ifeq ($(ld_lib_type),archive) - @echo '#define LIBSTUDXML_STATIC_LIB' >>$@ -endif - @echo '' >>$@ - @echo '#endif /* XML_DETAILS_CONFIG_H */' >>$@ - -$(call include-dep,$(c_od) $(cxx_od),$(c_obj) $(cxx_obj),$(out_base)/details/config.h) - -# Convenience alias for default target. -# -$(out_base)/: $(studxml.l) - -# Dist. -# - -# Set it for the out_root so that it is visible in examples/tests. See -# Makefile.am for why we need it there. -# -$(our_root)/%.dist: export xml_headers := $(xml_headers) - -$(dist): export sources := $(sources) -$(dist): export expat_sources := $(expat_sources) -$(dist): export expat_headers := $(expat_headers) -$(dist): export genx_sources := $(genx_sources) -$(dist): export genx_headers := $(genx_headers) -$(dist): export headers := $(subst $(src_base)/,,$(shell find $(src_base) \ --name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) -$(dist): data_dist := details/config-vc.h $(expat_dist) $(genx_dist) -$(dist): export extra_dist := $(data_dist) libstudxml-vc9.vcproj \ -libstudxml-vc10.vcxproj libstudxml-vc10.vcxproj.filters \ -libstudxml-vc11.vcxproj libstudxml-vc11.vcxproj.filters \ -libstudxml-vc12.vcxproj libstudxml-vc12.vcxproj.filters -$(dist): export interface_version = $(shell sed -e \ -'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) - -$(dist): - $(call dist-data,$(sources) $(expat_sources) $(genx_sources)) - $(call dist-data,$(headers) $(xml_headers) $(expat_headers) $(genx_headers)) - $(call dist-data,$(data_dist) details/config.h.in) - $(call meta-vc9proj,libstudxml-vc9.vcproj) - $(call meta-vc10proj,libstudxml-vc10.vcxproj) - $(call meta-vc10proj,libstudxml-vc11.vcxproj) - $(call meta-vc12proj,libstudxml-vc12.vcxproj) - $(call meta-automake) - -# Clean. -# -$(clean): $(studxml.l).o.clean \ - $(studxml.l.cpp-options).clean \ - $(addsuffix .cxx.clean,$(c_obj)) \ - $(addsuffix .cxx.clean,$(c_od)) \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - $(call message,rm $$1,rm -f $$1,$(out_base)/details/config.h) - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(studxml.l): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := details/config.h -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/install.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/c/c-o.make) -$(call include,$(bld_root)/c/c-d.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) -$(call include,$(bld_root)/cxx/o-l.make) diff --git a/m4/diff.m4 b/m4/diff.m4 deleted file mode 100644 index daa1ecf..0000000 --- a/m4/diff.m4 +++ /dev/null @@ -1,54 +0,0 @@ -dnl file : m4/diff.m4 -dnl copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -dnl license : MIT; see accompanying LICENSE file -dnl -dnl DIFF_TOOL -dnl -AC_DEFUN([DIFF_TOOL], [ -diff_found=no - -AC_ARG_VAR([DIFF],[diff command]) -AC_ARG_VAR([DIFFFLAGS],[diff flags]) - -AC_ARG_WITH( - [diff], - [AC_HELP_STRING([--with-diff=PATH],[path to the diff program])], - [diff_path=${withval}], - [diff_path=]) - -AC_MSG_CHECKING([for diff]) - -if test x"$DIFF" = x; then - if test x"$diff_path" != x; then - AS_SET_CATFILE([abs_diff_path], [$ac_pwd], [$diff_path]) - DIFF="$abs_diff_path" - else - DIFF=diff - fi -fi - -cat >conftest.txt - -$DIFF conftest.txt conftest.txt 2>/dev/null 1>&2 - -if test x"$?" = x0; then - AC_MSG_RESULT([$DIFF]) -else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([diff command is not found; consider setting the DIFF variable or using --with-diff=PATH]) -fi - -AC_MSG_CHECKING([whether $DIFF accepts -u]) - -$DIFF -u conftest.txt conftest.txt 2>/dev/null 1>&2 - -if test x"$?" = x0; then - AC_MSG_RESULT([yes]) - DIFFFLAGS="$DIFFFLAGS -u" -else - AC_MSG_RESULT([no]) -fi - -rm -f conftest.txt - -])dnl diff --git a/m4/disable-rpath.m4 b/m4/disable-rpath.m4 deleted file mode 100644 index b447978..0000000 --- a/m4/disable-rpath.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl file : m4/disable-rpath.m4 -dnl copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -dnl license : MIT; see accompanying LICENSE file -dnl -AC_DEFUN([DISABLE_RPATH],[ - -AC_MSG_CHECKING([whether to use rpath]) -AC_ARG_ENABLE( - [rpath], - [AC_HELP_STRING([--disable-rpath], [patch libtool to not use rpath])], - [libtool_rpath="$enable_rpath"], - [libtool_rpath="yes"]) -AC_MSG_RESULT($libtool_rpath) - -# Patch libtool to not use rpath if requested. -# -AC_CONFIG_COMMANDS( - [libtool-rpath-patch], - [if test "$libtool_use_rpath" = "no"; then - sed < libtool > libtool-2 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_NO_RPATH__ "/' - mv libtool-2 libtool - chmod 755 libtool - fi], - [libtool_use_rpath=$libtool_rpath]) -])dnl diff --git a/m4/libexpat.m4 b/m4/libexpat.m4 deleted file mode 100644 index bc025b1..0000000 --- a/m4/libexpat.m4 +++ /dev/null @@ -1,39 +0,0 @@ -dnl file : m4/libexpat.m4 -dnl copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -dnl license : MIT; see accompanying LICENSE file -dnl -dnl LIBEXPAT([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -dnl -dnl -AC_DEFUN([LIBEXPAT], [ -libexpat_found=no - -AC_MSG_CHECKING([for expat]) - -save_LIBS="$LIBS" -LIBS="-lexpat $LIBS" - -CXX_LIBTOOL_LINK_IFELSE([ -AC_LANG_SOURCE([ -#include - -int -main () -{ - XML_Parser p (XML_ParserCreateNS (0, XML_Char (' '))); - XML_ParserFree (p); -} -])], -[ -libexpat_found=yes -]) - -if test x"$libexpat_found" = xyes; then - AC_MSG_RESULT([yes]) - [$1] -else - LIBS="$save_LIBS" - AC_MSG_RESULT([no]) - [$2] -fi -])dnl diff --git a/m4/libtool-link.m4 b/m4/libtool-link.m4 deleted file mode 100644 index c459e01..0000000 --- a/m4/libtool-link.m4 +++ /dev/null @@ -1,46 +0,0 @@ -dnl file : m4/libtool-link.m4 -dnl copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -dnl license : MIT; see accompanying LICENSE file -dnl -dnl -dnl CXX_LIBTOOL_LINK_IFELSE (input, [action-if-true], [action-if-false]) -dnl -dnl Similar to AC_LINK_IFELSE except it uses libtool to perform the -dnl linking and it does this using the C++ compiler. -dnl -AC_DEFUN([CXX_LIBTOOL_LINK_IFELSE],[ -AC_LANG_SAVE -AC_LANG(C++) - -if test -d .libs; then - delete_libs_dir=no -else - delete_libs_dir=yes -fi - -AC_COMPILE_IFELSE([$1], -[ - ac_try='./libtool --tag=CXX --mode=link $CXX -no-install $CXXFLAGS $LDFLAGS -o conftest conftest.$OBJEXT $LIBS >&AS_MESSAGE_LOG_FD' - if _AC_DO_VAR(ac_try); then - libtool_link_ok=yes - else - libtool_link_ok=no - fi -], -[ - libtool_link_ok=no -]) - -if test x"$delete_libs_dir" = xyes; then - rm -rf .libs -fi - -if test x"$libtool_link_ok" = xyes; then -[$2] -: -else -[$3] -: -fi - -AC_LANG_RESTORE])dnl diff --git a/m4/pkgconfig.m4 b/m4/pkgconfig.m4 deleted file mode 100644 index 1083519..0000000 --- a/m4/pkgconfig.m4 +++ /dev/null @@ -1,12 +0,0 @@ -dnl file : m4/pkgconfig.m4 -dnl copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -dnl license : MIT; see accompanying LICENSE file -dnl -AC_DEFUN([PKGCONFIG],[ -AC_ARG_WITH( - [pkgconfigdir], - [AC_HELP_STRING([--with-pkgconfigdir=DIR],[location of pkgconfig dir (default is libdir/pkgconfig)])], - [pkgconfigdir=${withval}], - [pkgconfigdir='${libdir}/pkgconfig']) -AC_SUBST([pkgconfigdir]) -])dnl diff --git a/m4/static-lib.m4 b/m4/static-lib.m4 deleted file mode 100644 index 46725dc..0000000 --- a/m4/static-lib.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl file : m4/static-lib.m4 -dnl copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -dnl license : MIT; see accompanying LICENSE file -dnl -dnl STATIC_LIB(MACRO, DESCRIPTION) -dnl -dnl Define MACRO if we are on MinGW and are only building static library. -dnl -AC_DEFUN([STATIC_LIB], -[ -if test x$enable_shared = xno; then - case $host_os in - mingw*) - AC_DEFINE([$1], [1], [$2]) - ;; - esac -fi -])dnl diff --git a/makefile b/makefile deleted file mode 100644 index cad8723..0000000 --- a/makefile +++ /dev/null @@ -1,38 +0,0 @@ -# file : makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make - -dirs := xml tests examples doc - -default := $(out_base)/ -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(dirs))) - -$(dist): export dirs := $(dirs) -$(dist): export docs := LICENSE NEWS README INSTALL version -$(dist): data_dist := tester.bat libstudxml-vc9.sln libstudxml-vc10.sln \ -libstudxml-vc11.sln libstudxml-vc12.sln -$(dist): exec_dist := bootstrap tester.in -$(dist): export extra_dist := $(data_dist) $(exec_dist) -$(dist): export version = $(shell cat $(src_root)/version) - -$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs))) - $(call dist-data,$(docs) $(data_dist) libstudxml.pc.in) - $(call dist-exec,$(exec_dist)) - $(call dist-dir,m4) - $(call meta-automake) - $(call meta-autoconf) - -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(dirs))) - -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/automake.make) -$(call include,$(bld_root)/meta/autoconf.make) - -$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile)) diff --git a/tester.bat b/tester.bat deleted file mode 100644 index befb888..0000000 --- a/tester.bat +++ /dev/null @@ -1,68 +0,0 @@ -@echo off -rem file : tester.bat -rem copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -rem license : MIT; see accompanying LICENSE file - -rem -rem Run test or example. The test/example directory is the current directory. -rem -rem %1 "test" or "example" -rem %2 configuration, for example, Debug or Release -rem %3 platform, for example Win32 or x64 -rem topdir variable containing the path to top project directory -rem - -setlocal - -set "PATH=%topdir%\bin64;%topdir%\bin;%PATH%" - -if "_%DIFF%_" == "__" set DIFF=fc - -if "_%3_" == "_Win32_" ( - set "dir=%2" -) else ( - set "dir=%3\%2" -) - -rem Globbing returns files in alphabetic order. -rem -if exist *.xml ( - for %%f in (*.xml) do ( - - if "_%1_" == "_example_" ( - %dir%\driver.exe %%f - ) else ( - %dir%\driver.exe %%f >test.out - ) - - if errorlevel 1 ( - del /f test.out - goto error - ) - - if "_%1_" == "_test_" ( - - %DIFF% %%f test.out - - if errorlevel 1 ( - del /f test.out - goto error - ) - - del /f test.out - ) - ) -) else ( - - %dir%\driver.exe - if errorlevel 1 goto error -) - -goto end - -:error -endlocal -exit /b 1 - -:end -endlocal diff --git a/tester.in b/tester.in deleted file mode 100755 index bbe396c..0000000 --- a/tester.in +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh - -# file : tester.in -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -# -# Run test or example. The test driver is in the current directory. -# The data files, if any, are in $srcdir. If $example is set, then -# we are testing an example and no output verification is required. -# - -# Globbing returns files in alphabetic order. -# -files=`echo $srcdir/*.xml` - -if test "$files" != "$srcdir/*.xml"; then - for f in $files; do - echo ./driver $f - - if test -n "$example"; then - ./driver $f - else - ./driver $f >test.out - fi - - if test $? -ne 0; then - rm -f test.out - exit 1 - fi - - if test -z "$example"; then - @DIFF@ @DIFFFLAGS@ $f test.out - r=$? - rm -f test.out - if test $r -ne 0; then - exit 1 - fi - fi - done -else - echo ./driver - ./driver -fi diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index b4dfe28..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -# file : tests/Makefile.am -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -SUBDIRS = __path__(dirs) -EXTRA_DIST = __file__(extra_dist) diff --git a/tests/buildfile b/tests/buildfile index 3e7f5fa..b79265a 100644 --- a/tests/buildfile +++ b/tests/buildfile @@ -2,6 +2,4 @@ # copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC # license : MIT; see accompanying LICENSE file -d = parser/ roundtrip/ serializer/ -./: $d -include $d +./: parser/ roundtrip/ serializer/ diff --git a/tests/makefile b/tests/makefile deleted file mode 100644 index bfd4317..0000000 --- a/tests/makefile +++ /dev/null @@ -1,37 +0,0 @@ -# file : tests/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make - -tests := parser serializer roundtrip - -default := $(out_base)/ -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) - -$(dist): export dirs := $(tests) -$(dist): export extra_dist := test.bat tests-vc9.sln tests-vc10.sln \ -tests-vc11.sln tests-vc12.sln -$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) - $(call meta-automake) - $(call meta-vc9sln,tests-vc9.sln) - $(call meta-vc10sln,tests-vc10.sln) - $(call meta-vc11sln,tests-vc11.sln) - $(call meta-vc12sln,tests-vc12.sln) - $(call meta-vctest,tests-vc9.sln,test.bat) - -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(call include,$(bld_root)/meta/vc9sln.make) -$(call include,$(bld_root)/meta/vc10sln.make) -$(call include,$(bld_root)/meta/vc11sln.make) -$(call include,$(bld_root)/meta/vc12sln.make) -$(call include,$(bld_root)/meta/vctest.make) -$(call include,$(bld_root)/meta/automake.make) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/parser/makefile b/tests/parser/makefile deleted file mode 100644 index 934ea75..0000000 --- a/tests/parser/makefile +++ /dev/null @@ -1,89 +0,0 @@ -# file : tests/parser/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx - -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -$(dist): name := $(subst $(src_root)/tests/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): export extra_dist := $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/tests/roundtrip/makefile b/tests/roundtrip/makefile deleted file mode 100644 index 16dfefc..0000000 --- a/tests/roundtrip/makefile +++ /dev/null @@ -1,102 +0,0 @@ -# file : tests/roundtrip/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx - -tests := \ -attribute.xml \ -namespace.xml \ -followup-1.xml \ -followup-2.xml \ -characters.xml - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Dist -# -$(dist): name := $(subst $(src_root)/tests/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): extras := $(tests) -$(dist): export extra_dist := $(extras) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources) $(extras)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - -# Test. -# -$(test): tests := $(tests) -$(test): test_body = $(call message,test $< $1,$< $(src_base)/$1 >$(out_base)/test.out)$(literal_newline)\ -$(literal_tab)$(call message,,diff -u $(src_base)/$1 $(out_base)/test.out)$(literal_newline)\ -$(literal_tab)$(call message,,rm -f $(out_base)/test.out)$(literal_newline) -$(test): $(driver) - $(foreach t,$(tests),$(call test_body,$t)) - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/tests/serializer/makefile b/tests/serializer/makefile deleted file mode 100644 index d7b2815..0000000 --- a/tests/serializer/makefile +++ /dev/null @@ -1,91 +0,0 @@ -# file : tests/serializer/makefile -# copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -studxml.l := $(out_root)/xml/studxml.l -studxml.l.cpp-options := $(out_root)/xml/studxml.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -dist := $(out_base)/.dist -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(studxml.l) -$(cxx_obj) $(cxx_od): $(studxml.l.cpp-options) - -$(call include-dep,$(cxx_od)) - -# Alias for default target. -# -$(out_base)/: $(driver) - -# Dist -# -$(dist): name := $(subst $(src_root)/tests/,,$(src_base)) -$(dist): sources := $(cxx_tun) -$(dist): export extra_dist := $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ -$(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters \ -$(name)-vc12.vcxproj $(name)-vc12.vcxproj.filters -$(dist): - $(call dist-data,$(sources)) - $(call meta-automake,../template/Makefile.am) - $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) - $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) - $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) - $(call meta-vc12proj,../template/template-vc12.vcxproj,$(name)-vc12.vcxproj) - - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/dist.make) -$(call include,$(bld_root)/meta/vc9proj.make) -$(call include,$(bld_root)/meta/vc10proj.make) -$(call include,$(bld_root)/meta/vc11proj.make) -$(call include,$(bld_root)/meta/vc12proj.make) -$(call include,$(bld_root)/meta/automake.make) - -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/xml/makefile) diff --git a/tests/template/Makefile.am b/tests/template/Makefile.am deleted file mode 100644 index d8b5b50..0000000 --- a/tests/template/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# file : tests/template/Makefile.am -# copyright : not copyrighted - public domain - -EXTRA_DIST = __file__(extra_dist) - -noinst_PROGRAMS = driver -driver_SOURCES = driver.cxx __path__(extra_sources) __path__(extra_headers) -LDADD = $(top_builddir)/xml/libstudxml.la - -AM_CPPFLAGS = -I'$(top_builddir)' -I'$(top_srcdir)' - -TESTS=$(top_builddir)/tester -TESTS_ENVIRONMENT=example=; export example; - -CLEANFILES = test.out - -# Make sure make doesn't try to build the no-extension headers -# thinking that they are executable. Those are pulled in through -# auto-generated dependencies. -# -__foreach_w__(__f,__path__(xml_headers),$(top_srcdir)/xml/__f ): ; @: diff --git a/tests/template/template-vc10.vcxproj b/tests/template/template-vc10.vcxproj deleted file mode 100644 index f1849bd..0000000 --- a/tests/template/template-vc10.vcxproj +++ /dev/null @@ -1,167 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {__uuid__()} - Win32Proj - __value__(name) - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - $(Configuration)\ - driver - - - true - $(Platform)\$(Configuration)\ - driver - - - false - $(Configuration)\ - driver - - - false - $(Platform)\$(Configuration)\ - driver - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - -__header_entries__(extra_headers) - - -__source_entry__(driver.cxx) -__source_entries__(extra_sources) - - - - - diff --git a/tests/template/template-vc10.vcxproj.filters b/tests/template/template-vc10.vcxproj.filters deleted file mode 100644 index 6d459fa..0000000 --- a/tests/template/template-vc10.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {__uuid__()} - cxx - - - {__uuid__()} - h;hxx;ixx;txx - - - -__header_filter_entries__(extra_headers) - - -__source_filter_entry__(driver.cxx) -__source_filter_entries__(extra_sources) - - diff --git a/tests/template/template-vc11.vcxproj b/tests/template/template-vc11.vcxproj deleted file mode 100644 index dd43663..0000000 --- a/tests/template/template-vc11.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {__uuid__()} - Win32Proj - __value__(name) - - - - Application - true - v110 - Unicode - - - Application - true - v110 - Unicode - - - Application - false - v110 - true - Unicode - - - Application - false - v110 - true - Unicode - - - - - - - - - - - - - - - - - - - true - $(Configuration)\ - driver - - - true - $(Platform)\$(Configuration)\ - driver - - - false - $(Configuration)\ - driver - - - false - $(Platform)\$(Configuration)\ - driver - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - -__header_entries__(extra_headers) - - -__source_entry__(driver.cxx) -__source_entries__(extra_sources) - - - - - diff --git a/tests/template/template-vc11.vcxproj.filters b/tests/template/template-vc11.vcxproj.filters deleted file mode 100644 index 6d459fa..0000000 --- a/tests/template/template-vc11.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {__uuid__()} - cxx - - - {__uuid__()} - h;hxx;ixx;txx - - - -__header_filter_entries__(extra_headers) - - -__source_filter_entry__(driver.cxx) -__source_filter_entries__(extra_sources) - - diff --git a/tests/template/template-vc12.vcxproj b/tests/template/template-vc12.vcxproj deleted file mode 100644 index 411c7e0..0000000 --- a/tests/template/template-vc12.vcxproj +++ /dev/null @@ -1,171 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {__uuid__()} - Win32Proj - __value__(name) - - - - Application - true - v120 - Unicode - - - Application - true - v120 - Unicode - - - Application - false - v120 - true - Unicode - - - Application - false - v120 - true - Unicode - - - - - - - - - - - - - - - - - - - true - $(Configuration)\ - driver - - - true - $(Platform)\$(Configuration)\ - driver - - - false - $(Configuration)\ - driver - - - false - $(Platform)\$(Configuration)\ - driver - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml-d.lib;%(AdditionalDependencies) - Console - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;_CONSOLE;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - $(SolutionDir)\.. - 4068;4355;4800;4290;%(DisableSpecificWarnings) - - - $(SolutionDir)\..\lib64\studxml.lib;%(AdditionalDependencies) - Console - true - true - true - - - -__header_entries__(extra_headers) - - -__source_entry__(driver.cxx) -__source_entries__(extra_sources) - - - - - diff --git a/tests/template/template-vc12.vcxproj.filters b/tests/template/template-vc12.vcxproj.filters deleted file mode 100644 index 6d459fa..0000000 --- a/tests/template/template-vc12.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {__uuid__()} - cxx - - - {__uuid__()} - h;hxx;ixx;txx - - - -__header_filter_entries__(extra_headers) - - -__source_filter_entry__(driver.cxx) -__source_filter_entries__(extra_sources) - - diff --git a/tests/template/template-vc9.vcproj b/tests/template/template-vc9.vcproj deleted file mode 100644 index 2a95903..0000000 --- a/tests/template/template-vc9.vcproj +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -__source_entry__(driver.cxx) -__source_entries__(extra_sources) - - -__file_entries__(extra_headers) - - - - - diff --git a/tests/test.bat b/tests/test.bat deleted file mode 100644 index a6e1749..0000000 --- a/tests/test.bat +++ /dev/null @@ -1,74 +0,0 @@ -@echo off -rem file : tests/test.bat -rem copyright : Copyright (c) 2013-2017 Code Synthesis Tools CC -rem license : MIT; see accompanying LICENSE file - -setlocal - -set "tests=__path__(dirs)" -set "confs=__path__(configurations)" -set "plats=__path__(platforms)" -set "curdir=%CD%" -set "topdir=%curdir%\.." -set "failed=" - -goto start - -rem -rem %1 - test directory -rem %2 - configuration -rem %3 - platform -rem -:run_test - cd %1 - - if "_%3_" == "_Win32_" ( - set "dir=%2" - ) else ( - set "dir=%3\%2" - ) - - if exist %dir%\driver.exe ( - echo %1\%3\%2 - call %topdir%\tester.bat test %2 %3 - if errorlevel 1 ( - set "failed=%failed% %1\%3\%2" - ) - ) - - cd %curdir% -goto :eof - -:start - -for %%t in (%tests%) do ( - for %%c in (%confs%) do ( - for %%p in (%plats%) do ( - call :run_test %%t %%c %%p - ) - ) -) - -if not "_%failed%_" == "__" goto error - -echo. -echo ALL TESTS PASSED -echo. -goto end - -:usage -echo. -echo usage: test.bat -echo. - -:error -if not "_%failed%_" == "__" ( - echo. - for %%t in (%failed%) do echo FAILED: %%t - echo. -) -endlocal -exit /b 1 - -:end -endlocal diff --git a/tests/tests-vc10.sln b/tests/tests-vc10.sln deleted file mode 100644 index 9a5dc32..0000000 --- a/tests/tests-vc10.sln +++ /dev/null @@ -1,15 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tests/tests-vc11.sln b/tests/tests-vc11.sln deleted file mode 100644 index 436eeea..0000000 --- a/tests/tests-vc11.sln +++ /dev/null @@ -1,15 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tests/tests-vc12.sln b/tests/tests-vc12.sln deleted file mode 100644 index 446d701..0000000 --- a/tests/tests-vc12.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tests/tests-vc9.sln b/tests/tests-vc9.sln deleted file mode 100644 index 2ec9432..0000000 --- a/tests/tests-vc9.sln +++ /dev/null @@ -1,15 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal -- cgit v1.1