Cmake build: modify some tests

[lyx.git] / development / LyX-Mac-binary-release.sh

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 32e4b7cd7ba18f8c879616aa86725a82806f559e..fd81429604b8d791bdc0eb45da9a5d1a654245df 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -65,7 +65,7 @@ esac
 aspell_dictionaries="no"
 hunspell_dictionaries="yes"
 
-gettext_deployment="yes"
+gettext_deployment="no"
 aspell_deployment="yes"
 hunspell_deployment="yes"
 thesaurus_deployment="yes"
@@ -328,6 +328,9 @@ case $SDKs in
 esac
 MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
 
+# pkg-config is not usable with this script
+export PKG_CONFIG=""
+
 # These variables define the identifiers of the
 # system (both Intel and PowerPC) to compile for.
 # (Note: darwin8 is 10.4; darwin9 is 10.5.)
@@ -607,7 +610,6 @@ build_lyx() {
                        export QT4_CORE_LIBS="-framework QtCore"
                        export QT4_FRONTEND_CFLAGS="-FQtGui"
                        export QT4_FRONTEND_LIBS="-framework QtGui"
-                       export PKG_CONFIG=""
                        CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtCore.framework/Headers"
                        CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtGui.framework/Headers"
                fi
@@ -792,6 +794,7 @@ set_bundle_display_options() {
        LYX_Y_POSITION=$Y_POSITION
        APP_X_POSITION=$((3 * X_BOUNDS / 4))
        APP_Y_POSITION=$Y_POSITION
+       WITH_DOCUMENTS=$(test -d "${1}/Documents" && echo true || echo false)
        osascript <<-EOF
        tell application "Finder"
         set f to POSIX file ("${1}" as string) as alias
@@ -807,11 +810,13 @@ set_bundle_display_options() {
             delay 1 -- sync
             set icon size of the icon view options of container window to 64
             set arrangement of the icon view options of container window to not arranged
-            set position of item "Documents" to {$LYX_X_POSITION,0}
+            if ${WITH_DOCUMENTS} then
+               set position of item "Documents" to {$LYX_X_POSITION,0}
+            end if
             set position of item "${LyxName}.app" to {$LYX_X_POSITION,$LYX_Y_POSITION}
             set position of item "Applications" to {$APP_X_POSITION,$APP_Y_POSITION}
             set background picture of the icon view options\
-                                       of container window to file "background.png" of folder "Pictures"
+               of container window to file "background.png" of folder "Pictures"
             set the bounds of the container window to {0, 0, $X_BOUNDS, $Y_BOUNDS}
             update without registering applications
             delay 5 -- sync