[70486] branches/gsoc10-configfiles/tools

[and.damore at macports.org]

Revision: 70486
          http://trac.macports.org/changeset/70486
Author:   and.damore at macports.org
Date:     2010-08-11 02:14:30 -0700 (Wed, 11 Aug 2010)
Log Message:
-----------
edited tools, gsocmake speedy rebuild, changed dummy package name and Makefile

Modified Paths:
--------------
    branches/gsoc10-configfiles/tools/gsocdummy/Makefile
    branches/gsoc10-configfiles/tools/gsocdummyupdate.sh
    branches/gsoc10-configfiles/tools/gsocmake.c
    branches/gsoc10-configfiles/tools/gsocmake.sh

Modified: branches/gsoc10-configfiles/tools/gsocdummy/Makefile
===================================================================
--- branches/gsoc10-configfiles/tools/gsocdummy/Makefile	2010-08-11 06:56:19 UTC (rev 70485)
+++ branches/gsoc10-configfiles/tools/gsocdummy/Makefile	2010-08-11 09:14:30 UTC (rev 70486)
@@ -5,8 +5,7 @@
 
 install:
 	echo "GSoC dummy package target:"$(DESTDIR)$(PREFIX)
-	install gsoc-dummyrc $(DESTDIR)$(PREFIX)/etc
-	install gsoc-dummyrc $(DESTDIR)$(PREFIX)/etc/gsoc-dummyfile-2
+	install dummyrc $(DESTDIR)$(PREFIX)/etc
 
 clean:
 	

Modified: branches/gsoc10-configfiles/tools/gsocdummyupdate.sh
===================================================================
--- branches/gsoc10-configfiles/tools/gsocdummyupdate.sh	2010-08-11 06:56:19 UTC (rev 70485)
+++ branches/gsoc10-configfiles/tools/gsocdummyupdate.sh	2010-08-11 09:14:30 UTC (rev 70486)
@@ -31,11 +31,11 @@
 
 #update Portfile
 cp "$TMPFILE" "$PORTFILE"
-#update distfile
-mkdir -p /opt/mp-gsoc/var/macports/distfiles/gsoc-dummy/
-cp "$TARFILE" /opt/mp-gsoc/var/macports/distfiles/gsoc-dummy
+#update distfile, manual fetch phase
+mkdir -p /opt/mp-gsoc/var/macports/distfiles/gsocdummy/
+cp "$TARFILE" /opt/mp-gsoc/var/macports/distfiles/gsocdummy
 #clean status
-port clean gsoc-dummy
+port clean gsocdummy
 #clean /tmp too
 rm "$TMPFILE"
 

Modified: branches/gsoc10-configfiles/tools/gsocmake.c
===================================================================
--- branches/gsoc10-configfiles/tools/gsocmake.c	2010-08-11 06:56:19 UTC (rev 70485)
+++ branches/gsoc10-configfiles/tools/gsocmake.c	2010-08-11 09:14:30 UTC (rev 70486)
@@ -1,7 +1,19 @@
 #include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
 
 int main(int argc, char *argv[]) {
-setuid(geteuid());
-system("/usr/local/bin/gsocmake.sh");
-return 0;
+    char *cmd;
+    setuid(geteuid());
+    if (argc>1) {
+        cmd=(char *)malloc(sizeof(char)*strlen(argv[1])+27);
+        strcpy(cmd,"/usr/local/bin/gsocmake.sh ");
+        strcpy(cmd+27,argv[1]);
+    }
+    else{
+        cmd=(char *)malloc(sizeof(char)*27);
+        strcpy(cmd,"/usr/local/bin/gsocmake.sh");
+    }
+    system(cmd);
+    return 0;
 }

Modified: branches/gsoc10-configfiles/tools/gsocmake.sh
===================================================================
--- branches/gsoc10-configfiles/tools/gsocmake.sh	2010-08-11 06:56:19 UTC (rev 70485)
+++ branches/gsoc10-configfiles/tools/gsocmake.sh	2010-08-11 09:14:30 UTC (rev 70486)
@@ -5,10 +5,15 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 MP_PREFIX=/opt/mp-gsoc
 port cd gsoc
-sudo -u "$user" make distclean
-sudo -u "$user" ./configure --prefix=$MP_PREFIX \
-    --with-tclpackage=$MP_PREFIX/Library/Tcl \
-    --with-applications-dir=$MP_PREFIX/Applications
-sudo -u "$user" make
+if [[ $1 = "-s" ]]; then
+    echo "SPEEDY BUILD"
+    sudo -u "$user" make
+else
+    sudo -u "$user" make distclean
+    sudo -u "$user" ./configure --prefix=$MP_PREFIX \
+        --with-tclpackage=$MP_PREFIX/Library/Tcl \
+        --with-applications-dir=$MP_PREFIX/Applications
+    sudo -u "$user" make
+fi
 make install
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100811/7a1641fd/attachment-0001.html>