From f7c7210b3f44067edc81cd50aa717e4dd71a17a6 Mon Sep 17 00:00:00 2001 From: cantor Date: Mon, 11 Jun 2007 03:58:01 +0000 Subject: [PATCH] Updates for the installer. git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2299 cb58f699-b61c-0410-a6fe-9272a202ed29 --- doc/README.txt | 16 ++++++------- doc/mysql-4.0.12.diff | 35 --------------------------- msi/scripts/shib_edit_config_files.vbs | 43 +++++++++++++++------------------- 3 files changed, 27 insertions(+), 67 deletions(-) delete mode 100644 doc/mysql-4.0.12.diff diff --git a/doc/README.txt b/doc/README.txt index 35b25d0..427b26f 100644 --- a/doc/README.txt +++ b/doc/README.txt @@ -1,5 +1,5 @@ -9/1/05 -Version 1.3a +June 10, 2007 +Version 2.0alpha1 Welcome to Internet2's Shibboleth @@ -13,16 +13,16 @@ A wealth of information about Shibboleth can be found at http://shibboleth.internet2.edu/ Shibboleth is divided into identity and service provider components, with the -IdP in Java and the SP in C and C++. A Java SP is in development. +IdP in Java and the SP in C and C++. Source and binary distributions are available from -http://wayf.internet2.edu/shibboleth/ +http://shibboleth.internet2.edu/downloads/ -A CVS is available for anonymous access, as described at the Shibboleth -site. Mailing lists and a bugzilla (http://bugzilla.internet2.edu/) are also +SVN is available for anonymous access, as described at the Shibboleth +site. Mailing lists and a bug database (http://bugs.internet2.edu/) are also available. Not all of the lists are open, but a general support list is available and is open. For basic information on installing binaries and deploying Shibboleth, refer -to the web site for the latest documentation. For source build assistance, -see the INSTALL.txt file. +to the web site and Wiki for the latest documentation. For source build assistance, +see the INSTALL.txt file and the Wiki. diff --git a/doc/mysql-4.0.12.diff b/doc/mysql-4.0.12.diff deleted file mode 100644 index 0c523d2..0000000 --- a/doc/mysql-4.0.12.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- isam/Makefile.in~ Sat Mar 15 10:48:07 2003 -+++ isam/Makefile.in Mon Apr 7 22:59:53 2003 -@@ -306,7 +306,8 @@ - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+CXXLD = $(CXX) -+LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \ - pack_isam.c test1.c test2.c test3.c ---- myisam/Makefile.in~ Sat Mar 15 10:48:08 2003 -+++ myisam/Makefile.in Mon Apr 7 23:11:44 2003 -@@ -339,7 +339,8 @@ - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ - $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+CXXLD = $(CXX) -+LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(libmyisam_a_SOURCES) ft_dump.c mi_test1.c mi_test2.c \ - mi_test3.c myisamchk.c myisamlog.c myisampack.c ---- libmysqld/examples/Makefile.in~ Sat Mar 15 10:48:08 2003 -+++ libmysqld/examples/Makefile.in Tue Apr 8 00:24:40 2003 -@@ -274,7 +274,7 @@ - $(CXXLINK) $(mysql_LDFLAGS) $(mysql_OBJECTS) $(mysql_LDADD) $(LIBS) - mysqltest$(EXEEXT): $(mysqltest_OBJECTS) $(mysqltest_DEPENDENCIES) - @rm -f mysqltest$(EXEEXT) -- $(LINK) $(mysqltest_LDFLAGS) $(mysqltest_OBJECTS) $(mysqltest_LDADD) $(LIBS) -+ $(CXXLINK) $(mysqltest_LDFLAGS) $(mysqltest_OBJECTS) $(mysqltest_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core diff --git a/msi/scripts/shib_edit_config_files.vbs b/msi/scripts/shib_edit_config_files.vbs index 350681c..26177b9 100644 --- a/msi/scripts/shib_edit_config_files.vbs +++ b/msi/scripts/shib_edit_config_files.vbs @@ -90,7 +90,7 @@ if (Err = 0) then End If FileSystemObj.MoveFile ConfigFile, DistDir & "example-metadata.xml" - ConfigFile = DistDir & "shibboleth.xml.in" + ConfigFile = DistDir & "shibboleth2.xml.in" ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth" ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth" ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec" @@ -98,13 +98,13 @@ if (Err = 0) then ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir ReplaceInFile ConfigFile, " ", "" ReplaceInFile ConfigFile, "", "" - If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth.xml")) then - FileSystemObj.CopyFile ConfigFile, ConfigDir & "shibboleth.xml", false + If (NOT FileSystemObj.FileExists(ConfigDir & "shibboleth2.xml")) then + FileSystemObj.CopyFile ConfigFile, ConfigDir & "shibboleth2.xml", false End If - If (FileSystemObj.FileExists(DistDir & "shibboleth.xml")) then - FileSystemObj.DeleteFile DistDir & "shibboleth.xml", true + If (FileSystemObj.FileExists(DistDir & "shibboleth2.xml")) then + FileSystemObj.DeleteFile DistDir & "shibboleth2.xml", true End If - FileSystemObj.MoveFile ConfigFile, DistDir & "shibboleth.xml" + FileSystemObj.MoveFile ConfigFile, DistDir & "shibboleth2.xml" ConfigFile = DistDir & "shibd.logger.in" ReplaceInFile ConfigFile, "@-PKGLOGDIR-@", ConvertedDir & "/var/log/shibboleth" @@ -127,7 +127,7 @@ if (Err = 0) then FileSystemObj.MoveFile ConfigFile, DistDir & "native.logger" ConfigFile = DistDir & "apache.config.in" - ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth" + ReplaceInFile ConfigFile, "@-XMLDIR-@", ConvertedDir & "/share/xml" ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth" ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec" ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir @@ -140,7 +140,7 @@ if (Err = 0) then FileSystemObj.MoveFile ConfigFile, DistDir & "apache.config" ConfigFile = DistDir & "apache2.config.in" - ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth" + ReplaceInFile ConfigFile, "@-XMLDIR-@", ConvertedDir & "/share/xml" ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth" ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec" ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir @@ -153,7 +153,7 @@ if (Err = 0) then FileSystemObj.MoveFile ConfigFile, DistDir & "apache2.config" ConfigFile = DistDir & "apache22.config.in" - ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", ConvertedDir & "/share/xml/shibboleth" + ReplaceInFile ConfigFile, "@-XMLDIR-@", ConvertedDir & "/share/xml" ReplaceInFile ConfigFile, "@-PKGSYSCONFDIR-@", ConvertedDir & "/etc/shibboleth" ReplaceInFile ConfigFile, "@-LIBEXECDIR-@", ConvertedDir & "/libexec" ReplaceInFile ConfigFile, "@-PREFIX-@", ConvertedDir @@ -210,25 +210,20 @@ if (Err = 0) then ' Finally, fix up schema catalogs. XMLDir = InstallDir & "\share\xml\xmltooling\" - ConfigFile = XMLDir & "catalog.xml.in" - ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir - FileSystemObj.MoveFile ConfigFile, XMLDir & "catalog.xml" + ConfigFile = XMLDir & "catalog.xml" + ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir XMLDir = InstallDir & "\share\xml\opensaml\" - ConfigFile = XMLDir & "saml20-catalog.xml.in" - ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir - FileSystemObj.MoveFile ConfigFile, XMLDir & "saml20-catalog.xml" - ConfigFile = XMLDir & "saml11-catalog.xml.in" - ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir - FileSystemObj.MoveFile ConfigFile, XMLDir & "saml11-catalog.xml" - ConfigFile = XMLDir & "saml10-catalog.xml.in" - ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir - FileSystemObj.MoveFile ConfigFile, XMLDir & "saml10-catalog.xml" + ConfigFile = XMLDir & "saml20-catalog.xml" + ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir + ConfigFile = XMLDir & "saml11-catalog.xml" + ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir + ConfigFile = XMLDir & "saml10-catalog.xml" + ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir XMLDir = InstallDir & "\share\xml\shibboleth\" - ConfigFile = XMLDir & "catalog.xml.in" - ReplaceInFile ConfigFile, "@-PKGXMLDIR-@", XMLDir - FileSystemObj.MoveFile ConfigFile, XMLDir & "catalog.xml" + ConfigFile = XMLDir & "catalog.xml" + ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir 'Last End If End If \ No newline at end of file -- 2.1.4