Updated OS X scripts and moved OS X and Windows files from rtdata/ to tools/

tools/generateSourceTarball

@@ -1,16 +1,17 @@
 #!/usr/bin/env bash
 
 if [[ ! "$1" ]]; then
-  printf "%s\n" "Usage: $0 <hg tag>" "Example: $0 4.0.10"
+  printf "%s\n" "Usage: $0 <git tag>" "Example: $0 4.2"
   exit
 fi
 
-hg update "$1"
+git checkout "$1" || exit 0
 tools/generateReleaseInfo
 mkdir rawtherapee-"$1"
 mv ReleaseInfo.cmake rawtherapee-"$1"
-hg archive -X ".hg*" -X "rtgui/config.h" -X "rtgui/version.h" -X "rtdata/rawtherapee.desktop" rawtherapee-"$1".tar
+#hg archive -X ".hg*" -X "rtgui/config.h" -X "rtgui/version.h" -X "rtdata/rawtherapee.desktop" rawtherapee-"$1".tar
-tar -rf rawtherapee-"$1".tar rawtherapee-"$1"/ReleaseInfo.cmake
+git archive --format=tar "$1" > rawtherapee-"$1".tar
+tar --append --file=rawtherapee-"$1".tar rawtherapee-"$1"/ReleaseInfo.cmake
 xz -z -9e rawtherapee-"$1".tar
 rm -r rawtherapee-"$1"
-hg update
+git checkout

tools/osx/Info.plist.in

@@ -111,7 +111,7 @@
 	<key>CFBundleExecutable</key>
 	<string>rawtherapee</string>
 	<key>CFBundleGetInfoString</key>
-	<string>@version@, Copyright © 2004-2013 Gábor Horváth</string>
+	<string>@version@, Copyright © 2004-2010 Gábor Horváth, 2010-2016 RT dev team</string>
 	<key>CFBundleIconFile</key>
 	<string>rawtherapee.icns</string>
 	<key>CFBundleIdentifier</key>

tools/osx/executable_loader.in

@@ -4,7 +4,8 @@ cwd="$(cd "$(dirname "$0")"; pwd)"
 app="${cwd%/Contents/*}"
 etc="${cwd}"/etc
 
-# for different os x version (issue 1795)
+# for different os x versions
+# see https://github.com/Beep6581/RawTherapee/issues/1779
 cups_dir=/tmp/RT4
 install -d ${cups_dir}
 cp -f /usr/lib/libcups.2.dylib ${cups_dir}

tools/osx/macosx_bundle.sh

@@ -5,7 +5,7 @@
 # these are very important variables. Must be set into rtdata/CMakeLists.txt!
 # - PROJECT_NAME
 # - PROJECT_SOURCE_DIR
-# - PROJECT_VERSION (if without mercurial)
+# - PROJECT_VERSION (if without git)
 # - CMAKE_BUILD_TYPE
 # - PROC_BIT_DEPTH
 # - GTK_PREFIX
@@ -13,9 +13,11 @@
 function message {
   printf '\e[34m-- %s\e[m\n' "$*"
 }
+
 function GetDependencies {
   otool -L "$1" | awk 'NR >= 2 && $1 !~ /^(\/usr\/lib|\/System|@executable_path|@rpath)\// { print $1 }'
 }
+
 function CheckLink {
   GetDependencies "$1" | while read; do
     local dest="${LIB}/$(basename "${REPLY}")"
@@ -30,8 +32,13 @@ if test ! -d "${CMAKE_BUILD_TYPE}"; then
 fi
 
 # update project version
-if test -x $(which hg) -a -d "${PROJECT_SOURCE_DIR}/.hg"; then
+if test -x $(which git) -a -d "${PROJECT_SOURCE_DIR}/.git"; then
-  PROJECT_VERSION=$(hg -R "${PROJECT_SOURCE_DIR}" parents --template "{latesttag}.{latesttagdistance}")
+    # This is what the version ought to look like to be accurate in the git universe:
+    # PROJECT_VERSION="$(git describe --tags --always)_$(git symbolic-ref --short -q HEAD)"
+    # outputs: 4.2-677-g904467b_master
+    # but due to Apple requirements https://goo.gl/eWDQv6 we must use this:
+    PROJECT_VERSION="$(git describe --tags --always | sed -e 's/-g.*//' -e 's/-/./')"
+    # outputs: 4.2.677
 fi
 
 # if not specify CMAKE_OSX_DEPLOYMENT_TARGET when compiling,
@@ -157,7 +164,7 @@ cp "${PROJECT_SOURCE_DATA_DIR}"/{rawtherapee,profile}.icns "${RESOURCES}"
 cp "${PROJECT_SOURCE_DATA_DIR}"/PkgInfo "${CONTENTS}"
 install -m 0644 "${PROJECT_SOURCE_DATA_DIR}"/Info.plist.in "${CONTENTS}"/Info.plist
 sed -i "" -e "s|@version@|${PROJECT_VERSION}|
-              s|@shortVersion@|$(echo ${PROJECT_VERSION} | cut -d. -f-3)|
+              s|@shortVersion@|$(echo ${PROJECT_VERSION}|
               s|@arch@|${arch}|" \
               "${CONTENTS}"/Info.plist
 plutil -convert binary1 "${CONTENTS}"/Info.plist