From 295b42c0a0ecbb9bf4ab5cb16a706db345292fd6 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Sun, 6 Mar 2011 20:30:22 +0000 Subject: [PATCH] Reworking source tree and Makefiles for out of tree builds. --- .cproject | 1495 ++++++++++++++++------- .gitignore | 7 + Makefile.am | 4 +- config_win32.h | 6 +- configure.ac | 2 +- doc/.gitignore | 1 + m4/.gitignore | 5 + src/.gitignore | 1 + {shibresolver => src}/Makefile.am | 14 +- {shibresolver => src}/resolver-lite.vcxproj | 24 +- {shibresolver => src}/resolver.vcxproj | 24 +- {shibresolver => src/shibresolver}/.gitignore | 1 + {shibresolver => src/shibresolver}/base.h | 0 {shibresolver => src/shibresolver}/internal.h | 0 {shibresolver => src/shibresolver}/resolver.cpp | 0 {shibresolver => src/shibresolver}/resolver.h | 0 {shibresolver => src/shibresolver}/resolver.rc | 10 +- {shibresolver => src/shibresolver}/resource.h | 0 18 files changed, 1094 insertions(+), 500 deletions(-) create mode 100644 doc/.gitignore create mode 100644 m4/.gitignore create mode 100644 src/.gitignore rename {shibresolver => src}/Makefile.am (76%) rename {shibresolver => src}/resolver-lite.vcxproj (90%) rename {shibresolver => src}/resolver.vcxproj (90%) rename {shibresolver => src/shibresolver}/.gitignore (86%) rename {shibresolver => src/shibresolver}/base.h (100%) rename {shibresolver => src/shibresolver}/internal.h (100%) rename {shibresolver => src/shibresolver}/resolver.cpp (100%) rename {shibresolver => src/shibresolver}/resolver.h (100%) rename {shibresolver => src/shibresolver}/resolver.rc (89%) rename {shibresolver => src/shibresolver}/resource.h (100%) diff --git a/.cproject b/.cproject index 30761f3..99f65fd 100644 --- a/.cproject +++ b/.cproject @@ -1,460 +1,1035 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make + + all + true + true + false + + + make + + am--refresh + true + true + false + + + make + + check + true + true + false + + + make + + clean + true + true + false + + + make + + clean-libtool + true + true + false + + + make + + config.h + true + true + false + + + make + + ctags + true + true + false + + + make + + ctags-recursive + true + true + false + + + make + + dist + true + true + false + + + make + + dist-all + true + true + false + + + make + + dist-bzip2 + true + true + false + + + make + + dist-gzip + true + true + false + + + make + + dist-shar + true + true + false + + + make + + dist-tarZ + true + true + false + + + make + + dist-zip + true + true + false + + + make + + distcheck + true + true + false + + + make + + distclean + true + true + false + + + make + + distclean-hdr + true + true + false + + + make + + distclean-libtool + true + true + false + + + make + + distclean-tags + true + true + false + + + make + + distcleancheck + true + true + false + + + make + + distdir + true + true + false + + + make + + distuninstallcheck + true + true + false + + + make + + dvi + true + true + false + + + make + + html + true + true + false + + + make + + info + true + true + false + + + make + + install + true + true + false + + + make + + install-data + true + true + false + + + make + + install-dvi + true + true + false + + + make + + install-exec + true + true + false + + + make + + install-html + true + true + false + + + make + + install-info + true + true + false + + + make + + install-man + true + true + false + + + make + + install-pdf + true + true + false + + + make + + install-ps + true + true + false + + + make + + install-strip + true + true + false + + + make + + installcheck + true + true + false + + + make + + installdirs + true + true + false + + + make + + maintainer-clean + true + true + false + + + make + + Makefile + true + true + false + + + make + + mostlyclean + true + true + false + + + make + + mostlyclean-libtool + true + true + false + + + make + + pdf + true + true + false + + + make + + Portfile + true + true + false + + + make + + ps + true + true + false + + + make + + resolver.spec + true + true + false + + + make + + stamp-h1 + true + true + false + + + make + + tags + true + true + false + + + make + + tags-recursive + true + true + false + + + make + + uninstall + true + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 178ae37..cbb85b2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,10 @@ /*.suo /*.sdf /*.opensdf +/autom4te.cache +/build-aux +/configure +/config.h.in +/Makefile.in +/aclocal.m4 +/build diff --git a/Makefile.am b/Makefile.am index 890fd58..c229db7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = doc shibresolver +SUBDIRS = doc src -DIST_SUBDIRS = doc shibresolver +DIST_SUBDIRS = doc src GENFILES = resolver.spec Portfile diff --git a/config_win32.h b/config_win32.h index 7e5ffa2..eb5c3a5 100644 --- a/config_win32.h +++ b/config_win32.h @@ -66,13 +66,13 @@ #define PACKAGE_NAME "shibboleth-resolver" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "shibboleth-resolver 0.1" +#define PACKAGE_STRING "shibboleth-resolver 0.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "shibboleth-resolver" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.1" +#define PACKAGE_VERSION "0.2" /* Define to the necessary symbol if this constant uses a non-standard name on your system. */ @@ -85,7 +85,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "0.1" +#define VERSION "0.2" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/configure.ac b/configure.ac index 8d14ff2..08adb20 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ fi AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([resolver.spec Portfile]) -AC_CONFIG_FILES([Makefile doc/Makefile src/shibresolver/Makefile]) +AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile]) AC_PROG_CC([gcc gcc3 cc]) AC_PROG_CXX([g++ g++3 c++ CC]) diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000..10a7e8d --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1 @@ +/Makefile.in diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..28c9f02 --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,5 @@ +/ltoptions.m4 +/libtool.m4 +/lt~obsolete.m4 +/ltsugar.m4 +/ltversion.m4 diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..10a7e8d --- /dev/null +++ b/src/.gitignore @@ -0,0 +1 @@ +/Makefile.in diff --git a/shibresolver/Makefile.am b/src/Makefile.am similarity index 76% rename from shibresolver/Makefile.am rename to src/Makefile.am index 8ae0a06..6c53974 100644 --- a/shibresolver/Makefile.am +++ b/src/Makefile.am @@ -5,14 +5,14 @@ lib_LTLIBRARIES = libshibresolver.la libshibresolver-lite.la libshibresolverincludedir = $(includedir)/shibresolver libshibresolverinclude_HEADERS = \ - base.h \ - resolver.h + shibresolver/base.h \ + shibresolver/resolver.h noinst_HEADERS = \ - internal.h + shibresolver/internal.h common_sources = \ - resolver.cpp + shibresolver/resolver.cpp libshibresolver_la_SOURCES = \ ${common_sources} @@ -29,4 +29,8 @@ libshibresolver_lite_la_CPPFLAGS = -DSHIBSP_LITE install-exec-hook: for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done -EXTRA_DIST = resolver.vcxproj resolver-lite.vcxproj resource.h resolver.rc +EXTRA_DIST = \ + resolver.vcxproj \ + resolver-lite.vcxproj \ + shibresolver/resource.h \ + shibresolver/resolver.rc diff --git a/shibresolver/resolver-lite.vcxproj b/src/resolver-lite.vcxproj similarity index 90% rename from shibresolver/resolver-lite.vcxproj rename to src/resolver-lite.vcxproj index 9fef091..b64c3b9 100644 --- a/shibresolver/resolver-lite.vcxproj +++ b/src/resolver-lite.vcxproj @@ -19,16 +19,16 @@ - - - - + + + + - + - + {36D4FABF-ACDE-4947-9C4A-7AE1B50CD83B} @@ -93,10 +93,10 @@ $(ProjectName)1_0 $(ProjectName)1_0D $(ProjectName)1_0 - .;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath) - .;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath) - .;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath) - .;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath) + .;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath) + .;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath) + .;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath) + .;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath) @@ -119,7 +119,7 @@ true Windows $(TargetDir)$(ProjectName)1D.lib - ..\..\cpp-sp\$(Configuration);..\..\cpp-opensaml2\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories) + ..\..\cpp-sp\$(Configuration);..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories) @@ -140,7 +140,7 @@ true true $(TargetDir)$(ProjectName)1.lib - ..\..\cpp-sp\$(Configuration);..\..\cpp-opensaml2\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories) + ..\..\cpp-sp\$(Configuration);..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories) diff --git a/shibresolver/resolver.vcxproj b/src/resolver.vcxproj similarity index 90% rename from shibresolver/resolver.vcxproj rename to src/resolver.vcxproj index 2b5e7b7..0a7c0ff 100644 --- a/shibresolver/resolver.vcxproj +++ b/src/resolver.vcxproj @@ -19,16 +19,16 @@ - - - - + + + + - + - + {36D4FABF-ACDE-4947-9C4A-7AE1B50CD83A} @@ -93,10 +93,10 @@ $(ProjectName)1_0 $(ProjectName)1_0D $(ProjectName)1_0 - .;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath) - .;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath) - .;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath) - .;..\..\cpp-xmltooling;..\..\cpp-opensaml2;..\..\cpp-sp;$(IncludePath) + .;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath) + .;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath) + .;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath) + .;..\..\cpp-xmltooling;..\..\cpp-opensaml;..\..\cpp-sp;$(IncludePath) @@ -120,7 +120,7 @@ Windows MachineX86 $(TargetDir)$(ProjectName)1D.lib - ..\..\cpp-sp\$(Configuration);..\..\cpp-opensaml2\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories) + ..\..\cpp-sp\$(Configuration);..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories) @@ -139,7 +139,7 @@ true MachineX86 $(TargetDir)$(ProjectName)1.lib - ..\..\cpp-sp\$(Configuration);..\..\cpp-opensaml2\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories) + ..\..\cpp-sp\$(Configuration);..\..\cpp-opensaml\$(Configuration);..\..\cpp-xmltooling\$(Configuration);%(AdditionalLibraryDirectories) diff --git a/shibresolver/.gitignore b/src/shibresolver/.gitignore similarity index 86% rename from shibresolver/.gitignore rename to src/shibresolver/.gitignore index 368f3c5..dec6ee6 100644 --- a/shibresolver/.gitignore +++ b/src/shibresolver/.gitignore @@ -4,3 +4,4 @@ /shibresolver-lite-Release /x64 /*.user +/Makefile.in diff --git a/shibresolver/base.h b/src/shibresolver/base.h similarity index 100% rename from shibresolver/base.h rename to src/shibresolver/base.h diff --git a/shibresolver/internal.h b/src/shibresolver/internal.h similarity index 100% rename from shibresolver/internal.h rename to src/shibresolver/internal.h diff --git a/shibresolver/resolver.cpp b/src/shibresolver/resolver.cpp similarity index 100% rename from shibresolver/resolver.cpp rename to src/shibresolver/resolver.cpp diff --git a/shibresolver/resolver.h b/src/shibresolver/resolver.h similarity index 100% rename from shibresolver/resolver.h rename to src/shibresolver/resolver.h diff --git a/shibresolver/resolver.rc b/src/shibresolver/resolver.rc similarity index 89% rename from shibresolver/resolver.rc rename to src/shibresolver/resolver.rc index a12cd30..a685de2 100644 --- a/shibresolver/resolver.rc +++ b/src/shibresolver/resolver.rc @@ -54,8 +54,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,1,0,0 - PRODUCTVERSION 0,1,0,0 + FILEVERSION 0,2,0,0 + PRODUCTVERSION 0,2,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -73,7 +73,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "JANET(UK)\0" VALUE "FileDescription", "Shibboleth SP Attribute Resolver Extension\0" - VALUE "FileVersion", "0, 1, 0, 0\0" + VALUE "FileVersion", "0, 2, 0, 0\0" #ifdef SHIBSP_LITE #ifdef _DEBUG VALUE "InternalName", "shibresolver-lite1_0D\0" @@ -87,7 +87,7 @@ BEGIN VALUE "InternalName", "shibresolver1_0\0" #endif #endif - VALUE "LegalCopyright", "Copyright © 2010 JANET(UK)\0" + VALUE "LegalCopyright", "Copyright © 2011 JANET(UK)\0" VALUE "LegalTrademarks", "\0" #ifdef XMLTOOLING_LITE #ifdef _DEBUG @@ -104,7 +104,7 @@ BEGIN #endif VALUE "PrivateBuild", "\0" VALUE "ProductName", "Project Moonshot\0" - VALUE "ProductVersion", "0, 1, 0, 0\0" + VALUE "ProductVersion", "0, 2, 0, 0\0" VALUE "SpecialBuild", "\0" END END diff --git a/shibresolver/resource.h b/src/shibresolver/resource.h similarity index 100% rename from shibresolver/resource.h rename to src/shibresolver/resource.h -- 2.1.4