Author: ranger
Date: Tue Jul  3 03:32:43 2007
New Revision: 874

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=874&repname=user%3a+ranger
Log:
various build system fixes

Modified:
    trunk/kde-mac/Makefile
    trunk/kde-mac/environment-helper.sh
    trunk/kde-mac/kde.pmproj
    trunk/kde-mac/kdevplatform.pmproj
    trunk/kde-mac/make-packages.sh
    trunk/kde-mac/pkg-to-dmg.sh

Modified: trunk/kde-mac/Makefile
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/kde-mac/Makefile&rev=874&repname=user%3a+ranger
==============================================================================
--- trunk/kde-mac/Makefile (original)
+++ trunk/kde-mac/Makefile Tue Jul  3 03:32:43 2007
@@ -96,6 +96,8 @@
 packages/kdeutils.dmg: packages/kdeutils-$(DATESTAMP).dmg
 packages/kdewebdev.torrent: packages/kdewebdev-$(DATESTAMP).dmg.torrent
 packages/kdewebdev.dmg: packages/kdewebdev-$(DATESTAMP).dmg
+packages/kdevplatform.torrent: packages/kdevplatform-$(DATESTAMP).dmg.torrent
+packages/kdevplatform.dmg: packages/kdevplatform-$(DATESTAMP).dmg
 packages/kdevelop.torrent: packages/kdevelop-$(DATESTAMP).dmg.torrent
 packages/kdevelop.dmg: packages/kdevelop-$(DATESTAMP).dmg
 packages/koffice.torrent: packages/koffice-$(DATESTAMP).dmg.torrent

Modified: trunk/kde-mac/environment-helper.sh
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/kde-mac/environment-helper.sh&rev=874&repname=user%3a+ranger
==============================================================================
--- trunk/kde-mac/environment-helper.sh (original)
+++ trunk/kde-mac/environment-helper.sh Tue Jul  3 03:32:43 2007
@@ -41,10 +41,15 @@
                        export CCACHE_DISABLE=1
                fi
 
-               case `uname -m` in
-                       i386)
-                               export MAKEFLAGS=-j2
-                       ;;
-               esac
+               CPUS=`sysctl -n hw.ncpu 2>/dev/null`
+               CORES=`sysctl -n machdep.cpu.cores_per_package 2>/dev/null`
+
+               [ -z "$CPUS"  ] && CPUS=1
+               [ -z "$CORES" ] && CORES=1
+
+               CPUS=`expr $CPUS '*' $CORES 2>&1`
+
+               [ -z "$CPUS"  ] && CPUS=1
+               export MAKEFLAGS=-j$CPUS
                ;;
 esac

Modified: trunk/kde-mac/kde.pmproj
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/kde-mac/kde.pmproj&rev=874&repname=user%3a+ranger
==============================================================================
Binary files - no diff available.

Modified: trunk/kde-mac/kdevplatform.pmproj
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/kde-mac/kdevplatform.pmproj&rev=874&repname=user%3a+ranger
==============================================================================
Binary files - no diff available.

Modified: trunk/kde-mac/make-packages.sh
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/kde-mac/make-packages.sh&rev=874&repname=user%3a+ranger
==============================================================================
--- trunk/kde-mac/make-packages.sh (original)
+++ trunk/kde-mac/make-packages.sh Tue Jul  3 03:32:43 2007
@@ -141,21 +141,17 @@
                if [ "$DO_CLEAN" -eq 1 ] || [ ! -f Makefile ]; then
                        cmake -DCMAKE_INSTALL_PREFIX="$KDEDIR" 
"$ME/source.build/$PACKAGE"
                fi
-               make -j1
-               rm -rf "$ME/$PACKAGE/root/"*
-               make install
-               make install DESTDIR="$ME/$PACKAGE/root"
+               /usr/bin/make
+               if [ "$MAKE_DMGS" = 1 ]; then
+                       rm -rf "$ME/$PACKAGE/root/"*
+                       /usr/bin/make uninstall || :
+                       /usr/bin/make install DESTDIR="$ME/$PACKAGE/root"
+                       pushd ../..
+                               rm -rf packages/$PACKAGE-* packages/$PACKAGE.*
+                               /usr/bin/make packages/$PACKAGE.torrent
+                       popd
+                       rm -rf "$ME/$PACKAGE/root/"*
+               fi
+               /usr/bin/make install
        popd
 done
-
-if [ "$MAKE_DMGS" = "1" ]; then
-       rm -rf "$KDEDIR"
-
-       for dir in $DO_PACKAGES; do
-               PACKAGE=`echo $dir | cut -d: -f1`
-               SVNPATH=`echo $dir | cut -d: -f2`
-       
-               rm -rf packages/$PACKAGE-* packages/$PACKAGE.*
-               /usr/bin/make packages/$PACKAGE.torrent
-       done
-fi

Modified: trunk/kde-mac/pkg-to-dmg.sh
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/kde-mac/pkg-to-dmg.sh&rev=874&repname=user%3a+ranger
==============================================================================
--- trunk/kde-mac/pkg-to-dmg.sh (original)
+++ trunk/kde-mac/pkg-to-dmg.sh Tue Jul  3 03:32:43 2007
@@ -41,13 +41,10 @@
 done
 
 echo "- creating disk image"
-/usr/bin/hdiutil create -volname "$PACKAGENAME" -srcfolder "$TEMPDIR" -format 
UDBZ -ov "$TEMPDMG" >$LOGFILE 2>&1 || die "hdiutil exited with an error"
+/usr/bin/hdiutil create -volname "$PACKAGENAME" -srcfolder "$TEMPDIR" -format 
UDBZ -ov "$OUTPUTDIR/$OUTPUTFILE" >$LOGFILE 2>&1 || die "hdiutil exited with an 
error"
 
 echo "- internet enabling disk image"
-/usr/bin/hdiutil internet-enable -yes "$TEMPDMG" >$LOGFILE 2>&1
-
-echo "- copying disk image to final location"
-/usr/bin/ditto "$TEMPDMG" "$OUTPUTDIR/$OUTPUTFILE" >$LOGFILE 2>&1 || die 
"unable to copy temporary DMG file to $OUTPUTDIR"
+/usr/bin/hdiutil internet-enable -yes "$OUTPUTDIR/$OUTPUTFILE" >$LOGFILE 2>&1
 
 echo "- cleaning up"
 rm -rf "$TEMPDIR" "$LOGFILE" "$TEMPDMG"


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to