Update of /cvsroot/audacity/audacity-src/scripts
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31831
Modified Files:
mac_release_build mkdmg
Log Message:
Some updates to support Universal binaries.
Index: mkdmg
===================================================================
RCS file: /cvsroot/audacity/audacity-src/scripts/mkdmg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mkdmg 18 Mar 2007 01:45:15 -0000 1.5
+++ mkdmg 21 May 2008 07:05:36 -0000 1.6
@@ -37,7 +37,7 @@
mkdir "$DMG/plug-ins"
# Copy Audacity and clean it
-cp -pR Audacity.app "$DMG"
+cp -pR 'mac/build/Release Static Unicode/Audacity.app' "$DMG"
strip "$DMG/Audacity.app/Contents/MacOS/"*
# Copy Languages
Index: mac_release_build
===================================================================
RCS file: /cvsroot/audacity/audacity-src/scripts/mac_release_build,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mac_release_build 26 Mar 2007 03:46:56 -0000 1.2
+++ mac_release_build 21 May 2008 07:05:36 -0000 1.3
@@ -21,69 +21,13 @@
fi
done
-ARCH=$(uname -p)
-
-if [ "$ARCH" = "powerpc" ]
-then
- cat <<' EOF'
-
- Did you remember to rebuild wxWidgets with these env vars set:
-
- export MACOSX_DEPLOYMENT_TARGET=10.3
- export NEXT_ROOT="/Developer/SDKs/MacOSX10.3.9.sdk"
- export
C_INCLUDE_PATH="/usr/local/include:/Developer/SDKs/MacOSX10.3.9.sdk/usr/include"
- export
LIBRARY_PATH="/usr/local/lib:/Developer/SDKs/MacOSX10.3.9.sdk/usr/lib/gcc/darwin/3.3"
- export CPPFLAGS=-DMAC_OS_X_VERSION_MAX_ALLOWED=1030
-
- Press ENTER to continue
-
- EOF
- read dummy
-
- echo "Selecting gcc 3.3...requires root access...enter password when
prompted"
- echo
- sudo gcc_select 3.3
-
- export MACOSX_DEPLOYMENT_TARGET=10.3
- export NEXT_ROOT="/Developer/SDKs/MacOSX10.3.9.sdk"
- export
C_INCLUDE_PATH="/usr/local/include:/Developer/SDKs/MacOSX10.3.9.sdk/usr/include"
- export
LIBRARY_PATH="/usr/local/lib:/Developer/SDKs/MacOSX10.3.9.sdk/usr/lib/gcc/darwin/3.3"
- export CPPFLAGS=-DMAC_OS_X_VERSION_MAX_ALLOWED=1030
-fi
-
-#
-# Build UNICODE version only
-#
-./configure --enable-debug=no --enable-static=yes --enable-shared=no
--enable-unicode=yes --with-lib-preference=local,system
-
-#
-# gcc 3.3 doesn't understand '-msse'
-#
-sed -e 's/ -msse//' lib-src/soundtouch/source/SoundTouch/Makefile
>lib-src/soundtouch/source/SoundTouch/Makefile.new
-mv lib-src/soundtouch/source/SoundTouch/Makefile.new
lib-src/soundtouch/source/SoundTouch/Makefile
-
-#
-# Mac does not support elf binaries
-#
-if [ "$ARCH" = "i386" ]
-then
- sed -e 's/OBJ_FORMAT = elf/OBJ_FORMAT = aout/;s/-f $(OBJ_FORMAT)/-f macho/'
lib-src/libflac/src/libFLAC/ia32/Makefile
>lib-src/libflac/src/libFLAC/ia32/Makefile.new
- mv lib-src/libflac/src/libFLAC/ia32/Makefile.new
lib-src/libflac/src/libFLAC/ia32/Makefile
-fi
-
#
# Build it
#
-make
-
-if [ "$ARCH" = "powerpc" ]
-then
- unset NEXT_ROOT
-
- echo "Selecting gcc 4.0...requires root access...enter password when
prompted"
- echo
- sudo gcc_select 4.0
-fi
+cd mac
+xcodebuild -configuration 'Release Static Unicode'
+cd ..
+make -C locale
scripts/mkdmg $1 $2
mv *.dmg ..
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
