[csw-devel] SF.net SVN: gar:[9519] csw/mgar/pkg/ruby19/trunk

[bdwalton at users.sourceforge.net]

Revision: 9519
          http://gar.svn.sourceforge.net/gar/?rev=9519&view=rev
Author:   bdwalton
Date:     2010-04-02 16:54:57 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
ruby19: reinstate multiconfig with updates for SOS12 instead of 11

Modified Paths:
--------------
    csw/mgar/pkg/ruby19/trunk/Makefile
    csw/mgar/pkg/ruby19/trunk/files/README.csw

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2010-04-02 14:26:44 UTC (rev 9518)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2010-04-02 16:54:57 UTC (rev 9519)
@@ -109,16 +109,17 @@
 
 COMPILE_ELISP = 1
 
-PI_TARGETS  = samples rbconfig rbscripts
+PI_TARGETS  = samples rbconfig rbscripts multiconfig
 
 post-install-modulated: $(PI_TARGETS)
 	@$(MAKECOOKIE)
 
+multiconfig: RBCONFIG=/opt/csw/lib/ruby19/1.9.1/$(GARCH)-solaris2.9/rbconfig.rb
 multiconfig:
 	@echo "Setting up the CSW rbconfig stuff so we can switch between compilers"
-	@mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS11
+	@mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).SOS12
 	@gcp $(FILEDIR)/rbconfig.rb.GCC4.$(GARCH) $(DESTDIR)/$(RBCONFIG).GCC4
-	@gln -n -s $(RBCONFIG).SOS11 $(DESTDIR)$(RBCONFIG)
+	@gln -n -s $(RBCONFIG).SOS12 $(DESTDIR)$(RBCONFIG)
 	@gcp $(FILEDIR)/cswrbconfig $(DESTDIR)/opt/csw/bin/cswrbconfig19
 	@chmod 755 $(DESTDIR)/opt/csw/bin/cswrbconfig19
 	@ginstall -c -d -m 0755 $(DESTDIR)$(docdir)/$(GARNAME)/

Modified: csw/mgar/pkg/ruby19/trunk/files/README.csw
===================================================================
--- csw/mgar/pkg/ruby19/trunk/files/README.csw	2010-04-02 14:26:44 UTC (rev 9518)
+++ csw/mgar/pkg/ruby19/trunk/files/README.csw	2010-04-02 16:54:57 UTC (rev 9519)
@@ -1,11 +1,13 @@
 It is possible to switch rbconfig.rb files in order to use alternate
 compilation options or even compilers.  CSWruby19 ships with settings
-for Sun Studio 11 (what ruby was built with) and GCC4.  Our
+for Sun Studio 12 (what ruby was built with) and GCC4.  Our
 distribution of ruby sees rbconfig.rb be a symlink to
-rbconfig.rb.SOS11 by default.  To switch your settings, use the
-cswrbconfig19 tool provided.  Running it with no arguments will
-provide more details and list available configurations.
+rbconfig.rb.SOS12 by default.
 
+To switch your settings, use the cswrbconfig19 tool provided.  Running
+it with no arguments will provide more details and list available
+configurations.
+
 Please file a bug on CSWruby19 if you have problems using this tool.
 
 Ben Walton <bwalton at opencsw.org>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.