GNOME.org
 

[libsigc++2] Substitute API version in filenames dynamically

commit fcfbfd949199178859a17cfc0458b858e50408bb
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Aug 20 08:28:01 2009 +0200

    Substitute API version in filenames dynamically
    
    * sigc++.pc.in: Rename file from sigc++-2.0.pc.in.
    * sigc++-uninstalled.pc.in: Rename file from
    sigc++-2.0-uninstalled.pc.in.
    * MSVC_Net200[58]/sigc.rc.in: Rename files from sigc-2.0.rc.in
    and use @SIGCXX_API_VERSION@ substitution for the API version.
    Also replace @VERSION@ with @PACKAGE_VERSION  
    * MSVC_Net200[58]/libsigc++2.{sln,vcproj}: Remove version from
    the project name and filenames.
    * MSVC_Net200[58]/filelist.am: Remove version from filenames.
    * configure.ac (AC_CONFIG_FILES): Insert ${SIGCXX_MODULE_NAME}
    into output filenames and remove the version from the input
    filenames.
    * Makefile.am: Use $(SIGCXX_MODULE_NAME) in pkg-config file
    names instead of hard-coding the API version.
    * sigc++/Makefile.am (lib_LTLIBRARIES): Instead of hard-coding
    the libtool archive name, substitute @SIGCXX_API_VERSION@ into
    it, as well as into the derived variable names.

 .gitignore                                         |    2 +-
 ChangeLog                                          |   22 ++++++++++++++++++++
 MSVC_Net2005/filelist.am                           |    2 +-
 MSVC_Net2005/libsigc++2.sln                        |    2 +-
 MSVC_Net2005/libsigc++2.vcproj                     |    4 +-
 MSVC_Net2005/{sigc-2.0.rc.in => sigc.rc.in}        |    6 ++--
 MSVC_Net2008/filelist.am                           |    2 +-
 MSVC_Net2008/libsigc++2.sln                        |    2 +-
 MSVC_Net2008/libsigc++2.vcproj                     |    4 +-
 MSVC_Net2008/{sigc-2.0.rc.in => sigc.rc.in}        |    6 ++--
 Makefile.am                                        |    4 +-
 configure.ac                                       |    8 +++---
 ...0-uninstalled.pc.in => sigc++-uninstalled.pc.in |    0
 sigc++-2.0.pc.in => sigc++.pc.in                   |    0
 sigc++/Makefile.am                                 |   22 ++++++++++----------
 15 files changed, 54 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6bbe20a..e6fae7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ Makefile.in
 *.[ao]
 *.l[ao]
 /INSTALL
-/MSVC_Net200[58]/sigc-2.0.rc
+/MSVC_Net200[58]/sigc.rc
 /MSVC_Net200[58]/sigc++config.h
 /aclocal.m4
 /autom4te.cache/
diff --git a/ChangeLog b/ChangeLog
index f3bb4bb..3e5a33b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2009-08-20  Daniel Elstner  <danielk openismus com>
+
+	Substitute API version in filenames dynamically
+
+	* sigc++.pc.in: Rename file from sigc++-2.0.pc.in.
+	* sigc++-uninstalled.pc.in: Rename file from
+	sigc++-2.0-uninstalled.pc.in.
+	* MSVC_Net200[58]/sigc.rc.in: Rename files from sigc-2.0.rc.in
+	and use @SIGCXX_API_VERSION@ substitution for the API version.
+	Also replace @VERSION@ with @PACKAGE_VERSION  
+	* MSVC_Net200[58]/libsigc++2.{sln,vcproj}: Remove version from
+	the project name and filenames.
+	* MSVC_Net200[58]/filelist.am: Remove version from filenames.
+	* configure.ac (AC_CONFIG_FILES): Insert ${SIGCXX_MODULE_NAME}
+	into output filenames and remove the version from the input
+	filenames.
+	* Makefile.am: Use $(SIGCXX_MODULE_NAME) in pkg-config file
+	names instead of hard-coding the API version.
+	* sigc++/Makefile.am (lib_LTLIBRARIES): Instead of hard-coding
+	the libtool archive name, substitute @SIGCXX_API_VERSION@ into
+	it, as well as into the derived variable names.
+
 2009-08-17  Daniel Elstner  <danielk openismus com>
 
 	Set libtool version information
diff --git a/MSVC_Net2005/filelist.am b/MSVC_Net2005/filelist.am
index bd3e801..7f89dd1 100644
--- a/MSVC_Net2005/filelist.am
+++ b/MSVC_Net2005/filelist.am
@@ -5,7 +5,7 @@ msvc_net2005_data =								\
 	libsigc++2.sln								\
 	libsigc++2.vcproj							\
 	sigc++config.h								\
-	sigc-2.0.rc								\
+	sigc.rc									\
 	tests/test_accumulated/test_accumulated.vcproj				\
 	tests/test_bind/test_bind.vcproj					\
 	tests/test_bind_return/test_bind_return.vcproj				\
diff --git a/MSVC_Net2005/libsigc++2.sln b/MSVC_Net2005/libsigc++2.sln
index 4aa03a0..5c566ee 100644
--- a/MSVC_Net2005/libsigc++2.sln
+++ b/MSVC_Net2005/libsigc++2.sln
@@ -85,7 +85,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_disconnect_during_emit
 		{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72} = {83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigc-2.0", "libsigc++2.vcproj", "{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsigc++", "libsigc++2.vcproj", "{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/MSVC_Net2005/libsigc++2.vcproj b/MSVC_Net2005/libsigc++2.vcproj
index 39876d4..da7968f 100644
--- a/MSVC_Net2005/libsigc++2.vcproj
+++ b/MSVC_Net2005/libsigc++2.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="sigc-2.0"
+	Name="libsigc++"
 	ProjectGUID="{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
 	Keyword="Win32Proj"
 	>
@@ -526,7 +526,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\sigc-2.0.rc"
+				RelativePath=".\sigc.rc"
 				>
 			</File>
 		</Filter>
diff --git a/MSVC_Net2005/sigc-2.0.rc.in b/MSVC_Net2005/sigc.rc.in
similarity index 78%
rename from MSVC_Net2005/sigc-2.0.rc.in
rename to MSVC_Net2005/sigc.rc.in
index e7dd7fb..06f5ec9 100755
--- a/MSVC_Net2005/sigc-2.0.rc.in
+++ b/MSVC_Net2005/sigc.rc.in
@@ -16,11 +16,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The libsigc++ development team (see AUTHORS)"
             VALUE "FileDescription", "The Typesafe Callback Framework for C++"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "sigc-2.0"
+            VALUE "OriginalFilename", "sigc- SIGCXX_API_VERSION@.dll"
             VALUE "ProductName", "libsigc++"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/MSVC_Net2008/filelist.am b/MSVC_Net2008/filelist.am
index 5937bc3..7228e3e 100644
--- a/MSVC_Net2008/filelist.am
+++ b/MSVC_Net2008/filelist.am
@@ -5,7 +5,7 @@ msvc_net2008_data =								\
 	libsigc++2.sln								\
 	libsigc++2.vcproj							\
 	sigc++config.h								\
-	sigc-2.0.rc								\
+	sigc.rc									\
 	tests/test_accumulated/test_accumulated.vcproj				\
 	tests/test_bind/test_bind.vcproj					\
 	tests/test_bind_return/test_bind_return.vcproj				\
diff --git a/MSVC_Net2008/libsigc++2.sln b/MSVC_Net2008/libsigc++2.sln
index fab8075..70b86ad 100644
--- a/MSVC_Net2008/libsigc++2.sln
+++ b/MSVC_Net2008/libsigc++2.sln
@@ -85,7 +85,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_disconnect_during_emit
 		{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72} = {83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigc-2.0", "libsigc++2.vcproj", "{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsigc++", "libsigc++2.vcproj", "{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/MSVC_Net2008/libsigc++2.vcproj b/MSVC_Net2008/libsigc++2.vcproj
index 662eb5c..151cd15 100644
--- a/MSVC_Net2008/libsigc++2.vcproj
+++ b/MSVC_Net2008/libsigc++2.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="sigc-2.0"
+	Name="libsigc++"
 	ProjectGUID="{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
@@ -525,7 +525,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\sigc-2.0.rc"
+				RelativePath=".\sigc.rc"
 				>
 			</File>
 		</Filter>
diff --git a/MSVC_Net2008/sigc-2.0.rc.in b/MSVC_Net2008/sigc.rc.in
similarity index 78%
rename from MSVC_Net2008/sigc-2.0.rc.in
rename to MSVC_Net2008/sigc.rc.in
index e7dd7fb..06f5ec9 100644
--- a/MSVC_Net2008/sigc-2.0.rc.in
+++ b/MSVC_Net2008/sigc.rc.in
@@ -16,11 +16,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "The libsigc++ development team (see AUTHORS)"
             VALUE "FileDescription", "The Typesafe Callback Framework for C++"
-            VALUE "FileVersion", "@VERSION@"
+            VALUE "FileVersion", "@PACKAGE_VERSION@"
             VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
-            VALUE "OriginalFilename", "sigc-2.0"
+            VALUE "OriginalFilename", "sigc- SIGCXX_API_VERSION@.dll"
             VALUE "ProductName", "libsigc++"
-            VALUE "ProductVersion", "@VERSION@"
+            VALUE "ProductVersion", "@PACKAGE_VERSION@"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Makefile.am b/Makefile.am
index ec35af1..51e66e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,8 +28,8 @@ sigc_configdir = $(libdir)/$(SIGCXX_MODULE_NAME)/include
 nodist_sigc_config_HEADERS = sigc++config.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-nodist_pkgconfig_DATA = sigc++-2.0.pc
-noinst_DATA = sigc++-2.0-uninstalled.pc
+nodist_pkgconfig_DATA = $(SIGCXX_MODULE_NAME).pc
+noinst_DATA = $(SIGCXX_MODULE_NAME)-uninstalled.pc
 
 dist_noinst_SCRIPTS = autogen.sh
 
diff --git a/configure.ac b/configure.ac
index 1cb0625..36ea217 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,15 +62,15 @@ MM_ARG_ENABLE_WARNINGS([SIGC_WXXFLAGS],
                        [-pedantic -Wall -Wextra])
 
 AC_CONFIG_FILES([Makefile
-                 sigc++-2.0.pc
-                 sigc++-2.0-uninstalled.pc
+                 ${SIGCXX_MODULE_NAME}.pc:sigc++.pc.in
+                 ${SIGCXX_MODULE_NAME}-uninstalled.pc:sigc++-uninstalled.pc.in
                  sigc++/Makefile
                  examples/Makefile
                  tests/Makefile
                  docs/Makefile
                  docs/reference/Doxyfile
-                 MSVC_Net2005/sigc-2.0.rc
-                 MSVC_Net2008/sigc-2.0.rc])
+                 MSVC_Net2005/sigc.rc
+                 MSVC_Net2008/sigc.rc])
 
 # Copy the generated configuration headers into the MSVC project directories.
 AC_CONFIG_COMMANDS([MSVC_Net2005/sigc++config.h],
diff --git a/sigc++-2.0-uninstalled.pc.in b/sigc++-uninstalled.pc.in
similarity index 100%
rename from sigc++-2.0-uninstalled.pc.in
rename to sigc++-uninstalled.pc.in
diff --git a/sigc++-2.0.pc.in b/sigc++.pc.in
similarity index 100%
rename from sigc++-2.0.pc.in
rename to sigc++.pc.in
diff --git a/sigc++/Makefile.am b/sigc++/Makefile.am
index 5fc4d4f..5809e54 100644
--- a/sigc++/Makefile.am
+++ b/sigc++/Makefile.am
@@ -27,21 +27,21 @@ dist_noinst_DATA = $(sigc_m4)
 library_includedir = $(includedir)/$(SIGCXX_MODULE_NAME)/sigc++
 nobase_library_include_HEADERS = sigc++.h $(sigc_public_h) $(sigc_built_h)
 
-lib_LTLIBRARIES = libsigc-2.0.la
-
-libsigc_2_0_la_SOURCES =	\
-	signal.cc		\
-	signal_base.cc		\
-	trackable.cc		\
-	connection.cc		\
-	functors/slot.cc	\
-	functors/slot_base.cc	\
+lib_LTLIBRARIES = libsigc- SIGCXX_API_VERSION@.la
+
+libsigc_ SIGCXX_API_VERSION@_la_SOURCES =	\
+	signal.cc				\
+	signal_base.cc				\
+	trackable.cc				\
+	connection.cc				\
+	functors/slot.cc			\
+	functors/slot_base.cc			\
 	adaptors/lambda/lambda.cc
 
-EXTRA_libsigc_2_0_la_SOURCES = $(sigc_built_cc)
+EXTRA_libsigc_ SIGCXX_API_VERSION@_la_SOURCES = $(sigc_built_cc)
 
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-libsigc_2_0_la_LDFLAGS = -no-undefined -version-info 0:0:0
+libsigc_ SIGCXX_API_VERSION@_la_LDFLAGS = -no-undefined -version-info 0:0:0
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 AM_CXXFLAGS = $(SIGC_WXXFLAGS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]