[PC-BSD Commits] r3667 - in pbibuild/modules/spring: . kmenu-dir overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Thu Mar 26 11:44:30 PST 2009 

Author: kris
Date: 2009-03-26 12:44:30 -0700 (Thu, 26 Mar 2009)
New Revision: 3667

Added:
   pbibuild/modules/spring/kmenu-dir/maps-dir
   pbibuild/modules/spring/kmenu-dir/mods-dir
   pbibuild/modules/spring/overlay-dir/bin/spring.sh
   pbibuild/modules/spring/overlay-dir/folder-downloads.png
Modified:
   pbibuild/modules/spring/build.sh
   pbibuild/modules/spring/copy-files
   pbibuild/modules/spring/kmenu-dir/spring
   pbibuild/modules/spring/kmenu-dir/spring-dedicated
   pbibuild/modules/spring/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/spring/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/spring/pbi.conf
Log:

Updated the spring module, works really well now, and allows user to install new maps / mods easily



Modified: pbibuild/modules/spring/build.sh
===================================================================
--- pbibuild/modules/spring/build.sh	2009-03-26 18:35:38 UTC (rev 3666)
+++ pbibuild/modules/spring/build.sh	2009-03-26 19:44:30 UTC (rev 3667)
@@ -8,3 +8,9 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
+
+# Save the right version number in the spring.sh
+sed -e "s,CHANGEME,Spring${PORTVER},g" ${PBIDIR}/bin/spring.sh > /tmp/sed
+mv /tmp/sed ${PBIDIR}/bin/spring.sh
+chmod 755 ${PBIDIR}/bin/spring.sh
+

Modified: pbibuild/modules/spring/copy-files
===================================================================
--- pbibuild/modules/spring/copy-files	2009-03-26 18:35:38 UTC (rev 3666)
+++ pbibuild/modules/spring/copy-files	2009-03-26 19:44:30 UTC (rev 3667)
@@ -1,10 +1,14 @@
 /usr/local/bin/spring bin/
 /usr/local/bin/spring-dedicated bin/
+/usr/local/bin/lu* bin/
 /usr/local/lib/libspringserver.so lib/
 /usr/local/lib/libunitsync.so lib/
+/usr/local/lib/lu* lib/
+/usr/local/lib/liblu** lib/
 /usr/local/share/doc/spring share/doc/
 /usr/local/share/applications/spring.desktop share/applications/
 /usr/local/share/mime/packages/spring.xml share/mime/packages/
 /usr/local/share/pixmaps/spring.png share/pixmaps/
 /usr/local/share/pixmaps/application-x-spring-demo.png share/pixmaps/
 /usr/local/share/spring share/
+/usr/local/share/lu* share/

Modified: pbibuild/modules/spring/kmenu-dir/spring
===================================================================
--- pbibuild/modules/spring/kmenu-dir/spring	2009-03-26 18:35:38 UTC (rev 3666)
+++ pbibuild/modules/spring/kmenu-dir/spring	2009-03-26 19:44:30 UTC (rev 3667)
@@ -1,4 +1,4 @@
-ExePath: bin/spring
+ExePath: bin/spring.sh
 ExeIcon: share/pixmaps/spring.png
 ExeDescr: Spring
 ExeNoDesktop: 0
@@ -9,5 +9,5 @@
 ExeLink: 0
 ExeWebLink: 0
 ExeTaskbar: 0
-ExeOwndir: 2
+ExeOwndir: 1
 ExeKdeCat: Games

Modified: pbibuild/modules/spring/kmenu-dir/spring-dedicated
===================================================================
--- pbibuild/modules/spring/kmenu-dir/spring-dedicated	2009-03-26 18:35:38 UTC (rev 3666)
+++ pbibuild/modules/spring/kmenu-dir/spring-dedicated	2009-03-26 19:44:30 UTC (rev 3667)
@@ -1,13 +1,13 @@
 ExePath: bin/spring-dedicated
 ExeIcon: share/pixmaps/spring.png
-ExeDescr: Spring
+ExeDescr: Spring Dedicated Server
 ExeNoDesktop: 1
-ExeNoMenu: 1
+ExeNoMenu: 0
 ExeRunRoot: 0
 ExeRunShell: 0
 ExeNotify: 1
 ExeLink: 0
 ExeWebLink: 0
 ExeTaskbar: 0
-ExeOwndir: 2
+ExeOwndir: 1
 ExeKdeCat: Games

Modified: pbibuild/modules/spring/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/spring/overlay-dir/PBI.RemoveScript.sh	2009-03-26 18:35:38 UTC (rev 3666)
+++ pbibuild/modules/spring/overlay-dir/PBI.RemoveScript.sh	2009-03-26 19:44:30 UTC (rev 3667)
@@ -10,9 +10,10 @@
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove Spring user settings?" --title "Remove user settings"
+ kdialog --yesno "Do you want to remove Spring user settings and mods?" --title "Remove user settings"
  if [ "$?" = "0" ]
  then
+  rm -rf /Programs/share/spring
   cd /home
   for i in `ls`
   do

Modified: pbibuild/modules/spring/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/spring/overlay-dir/PBI.SetupScript.sh	2009-03-26 18:35:38 UTC (rev 3666)
+++ pbibuild/modules/spring/overlay-dir/PBI.SetupScript.sh	2009-03-26 19:44:30 UTC (rev 3667)
@@ -19,8 +19,22 @@
 if [ -d "/PCBSD/local/etc/fonts" ]
 then
   ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
 else
   ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
 fi
 
-echo "LAUNCHCLOSE: /Programs/bin/spring"
+# Make our shared maps / mods folder, so that it doesn't get removed across upgrades
+mkdir -p /Programs/share/spring/maps
+mkdir -p /Programs/share/spring/mods
+
+chmod 777 /Programs/share/spring/maps
+chmod 777 /Programs/share/spring/mods
+
+rm -rf /Programs/${PROGDIR}/share/spring/maps
+rm -rf /Programs/${PROGDIR}/share/spring/mods
+
+ln -s /Programs/share/spring/mods /Programs/${PROGDIR}/share/spring/mods
+ln -s /Programs/share/spring/maps /Programs/${PROGDIR}/share/spring/maps
+


Property changes on: pbibuild/modules/spring/overlay-dir/bin/spring.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pbibuild/modules/spring/overlay-dir/folder-downloads.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pbibuild/modules/spring/pbi.conf
===================================================================
--- pbibuild/modules/spring/pbi.conf	2009-03-26 18:35:38 UTC (rev 3666)
+++ pbibuild/modules/spring/pbi.conf	2009-03-26 19:44:30 UTC (rev 3667)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/lang/lua"
 
 # Enter your custom make options here
 MAKEOPTS=""
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="05"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

More information about the Commits mailing list