From 9028c807b2ca1e9c8bba4a570c4c780cc962ca61 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 14 Mar 2016 06:33:47 -0700 Subject: [PATCH] Change names of iOS build files The name subsurface-ios was used in many places and that was just not helpful to fight against. This should work much better. Signed-off-by: Dirk Hohndel --- .../{subsurface-ios => Subsurface-mobile}/MainForm.ui.qml | 0 .../Subsurface-mobile.pro} | 0 .../{subsurface-ios => Subsurface-mobile}/deployment.pri | 0 .../ios/{subsurface-ios => Subsurface-mobile}/main.qml | 0 packaging/ios/{subsurface-ios => Subsurface-mobile}/qml.qrc | 0 packaging/ios/build.sh | 6 +++--- 6 files changed, 3 insertions(+), 3 deletions(-) rename packaging/ios/{subsurface-ios => Subsurface-mobile}/MainForm.ui.qml (100%) rename packaging/ios/{subsurface-ios/subsurface-ios.pro => Subsurface-mobile/Subsurface-mobile.pro} (100%) rename packaging/ios/{subsurface-ios => Subsurface-mobile}/deployment.pri (100%) rename packaging/ios/{subsurface-ios => Subsurface-mobile}/main.qml (100%) rename packaging/ios/{subsurface-ios => Subsurface-mobile}/qml.qrc (100%) diff --git a/packaging/ios/subsurface-ios/MainForm.ui.qml b/packaging/ios/Subsurface-mobile/MainForm.ui.qml similarity index 100% rename from packaging/ios/subsurface-ios/MainForm.ui.qml rename to packaging/ios/Subsurface-mobile/MainForm.ui.qml diff --git a/packaging/ios/subsurface-ios/subsurface-ios.pro b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro similarity index 100% rename from packaging/ios/subsurface-ios/subsurface-ios.pro rename to packaging/ios/Subsurface-mobile/Subsurface-mobile.pro diff --git a/packaging/ios/subsurface-ios/deployment.pri b/packaging/ios/Subsurface-mobile/deployment.pri similarity index 100% rename from packaging/ios/subsurface-ios/deployment.pri rename to packaging/ios/Subsurface-mobile/deployment.pri diff --git a/packaging/ios/subsurface-ios/main.qml b/packaging/ios/Subsurface-mobile/main.qml similarity index 100% rename from packaging/ios/subsurface-ios/main.qml rename to packaging/ios/Subsurface-mobile/main.qml diff --git a/packaging/ios/subsurface-ios/qml.qrc b/packaging/ios/Subsurface-mobile/qml.qrc similarity index 100% rename from packaging/ios/subsurface-ios/qml.qrc rename to packaging/ios/Subsurface-mobile/qml.qrc diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 06cbfacdc..2b19d08a9 100644 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -26,9 +26,9 @@ LIBFTDI_VERSION=1.2 GITVERSION=$(git describe --tags --abbrev=12) CANONICALVERSION=$(git describe --tags --abbrev=12 | sed -e 's/-g.*$// ; s/^v//' | sed -e 's/-/./') MOBILEVERSION=$(grep MOBILE ../../cmake/Modules/version.cmake | cut -d\" -f 2) -echo "#define GIT_VERSION_STRING \"$GITVERSION\"" > subsurface-ios/ssrf-version.h -echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" >> subsurface-ios/ssrf-version.h -echo "#define MOBILE_VERSION_STRING \"$MOBILEVERSION\"" >> subsurface-ios/ssrf-version.h +echo "#define GIT_VERSION_STRING \"$GITVERSION\"" > subsurface-mobile/ssrf-version.h +echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" >> subsurface-mobile/ssrf-version.h +echo "#define MOBILE_VERSION_STRING \"$MOBILEVERSION\"" >> subsurface-mobile/ssrf-version.h # Build Subsurface-mobile by default SUBSURFACE_MOBILE=1