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 --- 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 ------------ 18 files changed, 53 insertions(+), 1298 deletions(-) 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 (limited to 'libstudxml') 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) -- cgit v1.1