Skip to content

Commit fcfbfd9

Browse files
author
Daniel Elstner
committed
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.
1 parent 2c53ba6 commit fcfbfd9

15 files changed

+54
-32
lines changed

Diff for: ‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Makefile.in
66
*.[ao]
77
*.l[ao]
88
/INSTALL
9-
/MSVC_Net200[58]/sigc-2.0.rc
9+
/MSVC_Net200[58]/sigc.rc
1010
/MSVC_Net200[58]/sigc++config.h
1111
/aclocal.m4
1212
/autom4te.cache/

Diff for: ‎ChangeLog

+22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2009-08-20 Daniel Elstner <danielk@openismus.com>
2+
3+
Substitute API version in filenames dynamically
4+
5+
* sigc++.pc.in: Rename file from sigc++-2.0.pc.in.
6+
* sigc++-uninstalled.pc.in: Rename file from
7+
sigc++-2.0-uninstalled.pc.in.
8+
* MSVC_Net200[58]/sigc.rc.in: Rename files from sigc-2.0.rc.in
9+
and use @SIGCXX_API_VERSION@ substitution for the API version.
10+
Also replace @VERSION@ with @PACKAGE_VERSION@.
11+
* MSVC_Net200[58]/libsigc++2.{sln,vcproj}: Remove version from
12+
the project name and filenames.
13+
* MSVC_Net200[58]/filelist.am: Remove version from filenames.
14+
* configure.ac (AC_CONFIG_FILES): Insert ${SIGCXX_MODULE_NAME}
15+
into output filenames and remove the version from the input
16+
filenames.
17+
* Makefile.am: Use $(SIGCXX_MODULE_NAME) in pkg-config file
18+
names instead of hard-coding the API version.
19+
* sigc++/Makefile.am (lib_LTLIBRARIES): Instead of hard-coding
20+
the libtool archive name, substitute @SIGCXX_API_VERSION@ into
21+
it, as well as into the derived variable names.
22+
123
2009-08-17 Daniel Elstner <danielk@openismus.com>
224

325
Set libtool version information

Diff for: ‎MSVC_Net2005/filelist.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msvc_net2005_data = \
55
libsigc++2.sln \
66
libsigc++2.vcproj \
77
sigc++config.h \
8-
sigc-2.0.rc \
8+
sigc.rc \
99
tests/test_accumulated/test_accumulated.vcproj \
1010
tests/test_bind/test_bind.vcproj \
1111
tests/test_bind_return/test_bind_return.vcproj \

Diff for: ‎MSVC_Net2005/libsigc++2.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_disconnect_during_emit
8585
{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72} = {83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}
8686
EndProjectSection
8787
EndProject
88-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigc-2.0", "libsigc++2.vcproj", "{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
88+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsigc++", "libsigc++2.vcproj", "{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
8989
EndProject
9090
Global
9191
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Diff for: ‎MSVC_Net2005/libsigc++2.vcproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<VisualStudioProject
33
ProjectType="Visual C++"
44
Version="8,00"
5-
Name="sigc-2.0"
5+
Name="libsigc++"
66
ProjectGUID="{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
77
Keyword="Win32Proj"
88
>
@@ -526,7 +526,7 @@
526526
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
527527
>
528528
<File
529-
RelativePath=".\sigc-2.0.rc"
529+
RelativePath=".\sigc.rc"
530530
>
531531
</File>
532532
</Filter>

Diff for: ‎MSVC_Net2005/sigc-2.0.rc.in renamed to ‎MSVC_Net2005/sigc.rc.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ BEGIN
1616
BEGIN
1717
VALUE "CompanyName", "The libsigc++ development team (see AUTHORS)"
1818
VALUE "FileDescription", "The Typesafe Callback Framework for C++"
19-
VALUE "FileVersion", "@VERSION@"
19+
VALUE "FileVersion", "@PACKAGE_VERSION@"
2020
VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
21-
VALUE "OriginalFilename", "sigc-2.0"
21+
VALUE "OriginalFilename", "sigc-@SIGCXX_API_VERSION@.dll"
2222
VALUE "ProductName", "libsigc++"
23-
VALUE "ProductVersion", "@VERSION@"
23+
VALUE "ProductVersion", "@PACKAGE_VERSION@"
2424
END
2525
END
2626
BLOCK "VarFileInfo"

Diff for: ‎MSVC_Net2008/filelist.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msvc_net2008_data = \
55
libsigc++2.sln \
66
libsigc++2.vcproj \
77
sigc++config.h \
8-
sigc-2.0.rc \
8+
sigc.rc \
99
tests/test_accumulated/test_accumulated.vcproj \
1010
tests/test_bind/test_bind.vcproj \
1111
tests/test_bind_return/test_bind_return.vcproj \

Diff for: ‎MSVC_Net2008/libsigc++2.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_disconnect_during_emit
8585
{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72} = {83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}
8686
EndProjectSection
8787
EndProject
88-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigc-2.0", "libsigc++2.vcproj", "{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
88+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsigc++", "libsigc++2.vcproj", "{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
8989
EndProject
9090
Global
9191
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Diff for: ‎MSVC_Net2008/libsigc++2.vcproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<VisualStudioProject
33
ProjectType="Visual C++"
44
Version="9,00"
5-
Name="sigc-2.0"
5+
Name="libsigc++"
66
ProjectGUID="{83997EF6-02D6-4CDB-8B3C-DBCA3018CC72}"
77
Keyword="Win32Proj"
88
TargetFrameworkVersion="131072"
@@ -525,7 +525,7 @@
525525
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
526526
>
527527
<File
528-
RelativePath=".\sigc-2.0.rc"
528+
RelativePath=".\sigc.rc"
529529
>
530530
</File>
531531
</Filter>

Diff for: ‎MSVC_Net2008/sigc-2.0.rc.in renamed to ‎MSVC_Net2008/sigc.rc.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ BEGIN
1616
BEGIN
1717
VALUE "CompanyName", "The libsigc++ development team (see AUTHORS)"
1818
VALUE "FileDescription", "The Typesafe Callback Framework for C++"
19-
VALUE "FileVersion", "@VERSION@"
19+
VALUE "FileVersion", "@PACKAGE_VERSION@"
2020
VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
21-
VALUE "OriginalFilename", "sigc-2.0"
21+
VALUE "OriginalFilename", "sigc-@SIGCXX_API_VERSION@.dll"
2222
VALUE "ProductName", "libsigc++"
23-
VALUE "ProductVersion", "@VERSION@"
23+
VALUE "ProductVersion", "@PACKAGE_VERSION@"
2424
END
2525
END
2626
BLOCK "VarFileInfo"

Diff for: ‎Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ sigc_configdir = $(libdir)/$(SIGCXX_MODULE_NAME)/include
2828
nodist_sigc_config_HEADERS = sigc++config.h
2929

3030
pkgconfigdir = $(libdir)/pkgconfig
31-
nodist_pkgconfig_DATA = sigc++-2.0.pc
32-
noinst_DATA = sigc++-2.0-uninstalled.pc
31+
nodist_pkgconfig_DATA = $(SIGCXX_MODULE_NAME).pc
32+
noinst_DATA = $(SIGCXX_MODULE_NAME)-uninstalled.pc
3333

3434
dist_noinst_SCRIPTS = autogen.sh
3535

Diff for: ‎configure.ac

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ MM_ARG_ENABLE_WARNINGS([SIGC_WXXFLAGS],
6262
[-pedantic -Wall -Wextra])
6363

6464
AC_CONFIG_FILES([Makefile
65-
sigc++-2.0.pc
66-
sigc++-2.0-uninstalled.pc
65+
${SIGCXX_MODULE_NAME}.pc:sigc++.pc.in
66+
${SIGCXX_MODULE_NAME}-uninstalled.pc:sigc++-uninstalled.pc.in
6767
sigc++/Makefile
6868
examples/Makefile
6969
tests/Makefile
7070
docs/Makefile
7171
docs/reference/Doxyfile
72-
MSVC_Net2005/sigc-2.0.rc
73-
MSVC_Net2008/sigc-2.0.rc])
72+
MSVC_Net2005/sigc.rc
73+
MSVC_Net2008/sigc.rc])
7474

7575
# Copy the generated configuration headers into the MSVC project directories.
7676
AC_CONFIG_COMMANDS([MSVC_Net2005/sigc++config.h],

Diff for: ‎sigc++-2.0-uninstalled.pc.in renamed to ‎sigc++-uninstalled.pc.in

File renamed without changes.

Diff for: ‎sigc++-2.0.pc.in renamed to ‎sigc++.pc.in

File renamed without changes.

Diff for: ‎sigc++/Makefile.am

+11-11
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ dist_noinst_DATA = $(sigc_m4)
2727
library_includedir = $(includedir)/$(SIGCXX_MODULE_NAME)/sigc++
2828
nobase_library_include_HEADERS = sigc++.h $(sigc_public_h) $(sigc_built_h)
2929

30-
lib_LTLIBRARIES = libsigc-2.0.la
31-
32-
libsigc_2_0_la_SOURCES = \
33-
signal.cc \
34-
signal_base.cc \
35-
trackable.cc \
36-
connection.cc \
37-
functors/slot.cc \
38-
functors/slot_base.cc \
30+
lib_LTLIBRARIES = libsigc-@SIGCXX_API_VERSION@.la
31+
32+
libsigc_@SIGCXX_API_VERSION@_la_SOURCES = \
33+
signal.cc \
34+
signal_base.cc \
35+
trackable.cc \
36+
connection.cc \
37+
functors/slot.cc \
38+
functors/slot_base.cc \
3939
adaptors/lambda/lambda.cc
4040

41-
EXTRA_libsigc_2_0_la_SOURCES = $(sigc_built_cc)
41+
EXTRA_libsigc_@SIGCXX_API_VERSION@_la_SOURCES = $(sigc_built_cc)
4242

4343
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
44-
libsigc_2_0_la_LDFLAGS = -no-undefined -version-info 0:0:0
44+
libsigc_@SIGCXX_API_VERSION@_la_LDFLAGS = -no-undefined -version-info 0:0:0
4545

4646
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
4747
AM_CXXFLAGS = $(SIGC_WXXFLAGS)

0 commit comments

Comments
 (0)