From 14d8bdad31a7e7be9a7977e6f8a74ed6a9b4dbbc Mon Sep 17 00:00:00 2001 From: mcmartin Date: Sun, 13 Feb 2011 04:37:18 +0000 Subject: [PATCH] Update content version to 0.7. Update install scripts to match. Strip PPC support from Mac build, since this is no longer a configuration we can test. Fix some bugs in the build uqm install sequence on Mac. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3553 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/unix/build.config | 1 + sc2/build/unix/config_proginfo_build | 6 +++--- sc2/build/win32_install/uqm-installer.nsi | 2 +- sc2/content/version | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config index d1b8f45f0..8bbec23d1 100644 --- a/sc2/build/unix/build.config +++ b/sc2/build/unix/build.config @@ -554,6 +554,7 @@ uqm_install_osx() { mkdirhier "$INSTROOT/MacOS" 0755 mkdirhier "$INSTROOT/Frameworks" 0755 mkdirhier "$INSTROOT/Resources/content/addons" 0755 + mkdirhier "$INSTROOT/Resources/content/packages" 0755 # Install misc. resources, icons, etc. echo "Installing miscellaneous resources..." >&2 diff --git a/sc2/build/unix/config_proginfo_build b/sc2/build/unix/config_proginfo_build index 2b1ce32b8..8e1b463bc 100644 --- a/sc2/build/unix/config_proginfo_build +++ b/sc2/build/unix/config_proginfo_build @@ -62,9 +62,9 @@ useGccBuildTools() { } case "$HOST_SYSTEM" in Darwin) - EXTRA_PLATFORM_GCC_FLAGS_COMPILE_C='-mmacosx-version-min=10.4 -arch ppc -arch i386' - EXTRA_PLATFORM_GCC_FLAGS_COMPILE_OBJC='-mmacosx-version-min=10.4 -arch ppc -arch i386' - EXTRA_PLATFORM_GCC_FLAGS_LINK='-mmacosx-version-min=10.4 -arch ppc -arch i386' + EXTRA_PLATFORM_GCC_FLAGS_COMPILE_C='-mmacosx-version-min=10.4 -arch i386' + EXTRA_PLATFORM_GCC_FLAGS_COMPILE_OBJC='-mmacosx-version-min=10.4 -arch i386' + EXTRA_PLATFORM_GCC_FLAGS_LINK='-mmacosx-version-min=10.4 -arch i386' useGccBuildTools ;; WINSCW) diff --git a/sc2/build/win32_install/uqm-installer.nsi b/sc2/build/win32_install/uqm-installer.nsi index 1cf46033c..92cbbf192 100644 --- a/sc2/build/win32_install/uqm-installer.nsi +++ b/sc2/build/win32_install/uqm-installer.nsi @@ -7,7 +7,7 @@ Var UQMUSERDATA ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "The Ur-Quan Masters" -!define PRODUCT_VERSION "0.6.2" +!define PRODUCT_VERSION "0.7.0" !define PRODUCT_WEB_SITE "http://sc2.sourceforge.net" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\uqm.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" diff --git a/sc2/content/version b/sc2/content/version index 47b097a12..5a41a146b 100644 --- a/sc2/content/version +++ b/sc2/content/version @@ -1,3 +1,3 @@ -0.6.0 +0.7.0 $Date$