install wxrc as wxrc-2.5, with symlink

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
index 748d62d6b9f55970a1b0c015ed1f75d4794ee4d2..79fdd9ff328353be35e0e0b69b41208b72fd9b23 100644 (file)
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -11,6 +11,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 EXEEXT = @EXEEXT@
+LN_S = @LN_S@
 SETFILE = @SETFILE@
 STRIP = @STRIP@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -53,6 +54,7 @@ WXRC_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_USE_XRC_1@__wxrc___depname = wxrc$(EXEEXT)
 @COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL wxrc$(EXEEXT)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -63,6 +65,7 @@ COND_MONOLITHIC_0___WXLIB_XML_p = \
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
        -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+@COND_USE_XRC_1@__install_wxrc___depname = install_wxrc
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
        -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -87,9 +90,9 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 
 ### Targets: ###
 
-all: wxrc$(EXEEXT)
+all: $(__wxrc___depname)
 
-install: all install_wxrc
+install: all $(__install_wxrc___depname)
 
 uninstall: 
 
@@ -104,14 +107,16 @@ clean:
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-wxrc$(EXEEXT): $(WXRC_OBJECTS)
-       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
-       
-       $(__wxrc___mac_setfilecmd)
+@COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
+@COND_USE_XRC_1@       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_USE_XRC_1@       
+@COND_USE_XRC_1@       $(__wxrc___mac_setfilecmd)
 
-install_wxrc: 
-       $(INSTALL_DIR) $(DESTDIR)$(bindir)
-       $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+@COND_USE_XRC_1@install_wxrc: 
+@COND_USE_XRC_1@       $(INSTALL_DIR) $(DESTDIR)$(bindir)
+@COND_USE_XRC_1@       $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+@COND_USE_XRC_1@       mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+@COND_USE_XRC_1@       (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
 
 wxrc_wxrc.o: $(srcdir)/wxrc.cpp
        $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<

diff --git a/utils/wxrc/wxrc.bkl b/utils/wxrc/wxrc.bkl
index a18bd9815ab4f06cf44ae6cc4af1a9d4fea6f582..0db09668c60478a6f7a307ec8839c885cd653116 100644 (file)
--- a/utils/wxrc/wxrc.bkl
+++ b/utils/wxrc/wxrc.bkl
@@ -3,11 +3,27 @@
 
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
-    <exe id="wxrc" template="wx_util_console" template_append="wx_append">
+    <exe id="wxrc" cond="USE_XRC=='1'"
+         template="wx_util_console" template_append="wx_append">
         <sources>wxrc.cpp</sources>
         <wx-lib>xml</wx-lib>
         <wx-lib>base</wx-lib>
         <install-to>$(BINDIR)</install-to>
     </exe>
 
+    <if cond="FORMAT=='autoconf'">
+        
+        <!-- Install wxrc as $prefix/bin/wxrc-$version with a wxrc symlink
+             pointing to it, so that users can use wxrc from different
+             versions. -->
+    
+        <set var="versioned_name">wxrc-$(WX_RELEASE)</set>
+        <modify-target target="install_wxrc">
+            <command>
+                mv -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
+                (cd $(DESTDIR)$(BINDIR) &amp;&amp; $(LN_S) $(versioned_name) wxrc$(EXEEXT))
+            </command>
+        </modify-target>
+    </if>
+
 </makefile>