[Libreoffice-commits] online.git: configure.ac .gitignore ios/Mobile ios/Mobile.xcodeproj ios/README ios/TestFakeSocket Mobile/Mobile Mobile/Mobile.xcodeproj Mobile/README Mobile/TestFakeSocket

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 22 14:56:16 UTC 2018 

 .gitignore   |    4 ++--
 configure.ac |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a6eadf4e8137584b4066ea5e316675540c1e4fa2
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 22 16:50:57 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 22 16:50:57 2018 +0200

    Move the iOS app to the ios folder
    
    Change-Id: I46e0722b027e93f90b5cd6a74cd7dc46f6c8cea2

diff --git a/.gitignore b/.gitignore
index f910a6d82..a853fa87f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,11 +80,11 @@ test/TAGS
 docker/instdir
 docker/builddir
 
-Mobile/Mobile/Info.plist
+ios/Mobile/Info.plist
 
 # symlinks created by configure for the iOS app Xcode project
 lobuilddir-symlink
 pocoinclude-symlink
 pocolib-symlink
 ICU.dat
-Mobile/Mobile/Assets.xcassets/AppIcon.appiconset
+ios/Mobile/Assets.xcassets/AppIcon.appiconset
diff --git a/configure.ac b/configure.ac
index b2480942c..4446e4b51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -602,7 +602,7 @@ AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap])
 
 AC_CONFIG_FILES([Makefile
                  gtk/Makefile
-                 Mobile/Mobile/Info.plist
+                 ios/Mobile/Info.plist
                  test/Makefile
                  loleaflet/Makefile
                  loleaflet/npm-shrinkwrap.json
@@ -657,12 +657,12 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
           # Sadly Xcode doesn't like it if AppIcon.appiconset is a
           # symlink, so make it a directory of symlinks to the actual png
           # and json files.
-          rm -rf Mobile/Mobile/Assets.xcassets/AppIcon.appiconset
-          mkdir Mobile/Mobile/Assets.xcassets/AppIcon.appiconset
+          rm -rf ios/Mobile/Assets.xcassets/AppIcon.appiconset
+          mkdir ios/Mobile/Assets.xcassets/AppIcon.appiconset
           if test -n "$with_iosapp_appicon"; then
-             ln -s "$with_iosapp_appicon"/* Mobile/Mobile/Assets.xcassets/AppIcon.appiconset
+             ln -s "$with_iosapp_appicon"/* ios/Mobile/Assets.xcassets/AppIcon.appiconset
           else
-             ln -s Mobile/Mobile/Assets.xcassets/Empty.appiconset/* Mobile/Mobile/Assets.xcassets/AppIcon.appiconset
+             ln -s ios/Mobile/Assets.xcassets/Empty.appiconset/* ios/Mobile/Assets.xcassets/AppIcon.appiconset
           fi
        fi
       ],
diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj b/ios/Mobile.xcodeproj/project.pbxproj
similarity index 100%
rename from Mobile/Mobile.xcodeproj/project.pbxproj
rename to ios/Mobile.xcodeproj/project.pbxproj
diff --git a/Mobile/Mobile/AppDelegate.h b/ios/Mobile/AppDelegate.h
similarity index 100%
rename from Mobile/Mobile/AppDelegate.h
rename to ios/Mobile/AppDelegate.h
diff --git a/Mobile/Mobile/AppDelegate.mm b/ios/Mobile/AppDelegate.mm
similarity index 100%
rename from Mobile/Mobile/AppDelegate.mm
rename to ios/Mobile/AppDelegate.mm
diff --git a/Mobile/Mobile/Assets.xcassets/Contents.json b/ios/Mobile/Assets.xcassets/Contents.json
similarity index 100%
rename from Mobile/Mobile/Assets.xcassets/Contents.json
rename to ios/Mobile/Assets.xcassets/Contents.json
diff --git a/Mobile/Mobile/Assets.xcassets/Empty.appiconset/Contents.json b/ios/Mobile/Assets.xcassets/Empty.appiconset/Contents.json
similarity index 100%
rename from Mobile/Mobile/Assets.xcassets/Empty.appiconset/Contents.json
rename to ios/Mobile/Assets.xcassets/Empty.appiconset/Contents.json
diff --git a/Mobile/Mobile/Assets.xcassets/Image.imageset/Contents.json b/ios/Mobile/Assets.xcassets/Image.imageset/Contents.json
similarity index 100%
rename from Mobile/Mobile/Assets.xcassets/Image.imageset/Contents.json
rename to ios/Mobile/Assets.xcassets/Image.imageset/Contents.json
diff --git a/Mobile/Mobile/Base.lproj/LaunchScreen.storyboard b/ios/Mobile/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from Mobile/Mobile/Base.lproj/LaunchScreen.storyboard
rename to ios/Mobile/Base.lproj/LaunchScreen.storyboard
diff --git a/Mobile/Mobile/Base.lproj/Main.storyboard b/ios/Mobile/Base.lproj/Main.storyboard
similarity index 100%
rename from Mobile/Mobile/Base.lproj/Main.storyboard
rename to ios/Mobile/Base.lproj/Main.storyboard
diff --git a/Mobile/Mobile/Document.h b/ios/Mobile/Document.h
similarity index 100%
rename from Mobile/Mobile/Document.h
rename to ios/Mobile/Document.h
diff --git a/Mobile/Mobile/Document.mm b/ios/Mobile/Document.mm
similarity index 100%
rename from Mobile/Mobile/Document.mm
rename to ios/Mobile/Document.mm
diff --git a/Mobile/Mobile/DocumentBrowserViewController.h b/ios/Mobile/DocumentBrowserViewController.h
similarity index 100%
rename from Mobile/Mobile/DocumentBrowserViewController.h
rename to ios/Mobile/DocumentBrowserViewController.h
diff --git a/Mobile/Mobile/DocumentBrowserViewController.mm b/ios/Mobile/DocumentBrowserViewController.mm
similarity index 100%
rename from Mobile/Mobile/DocumentBrowserViewController.mm
rename to ios/Mobile/DocumentBrowserViewController.mm
diff --git a/Mobile/Mobile/DocumentViewController.h b/ios/Mobile/DocumentViewController.h
similarity index 100%
rename from Mobile/Mobile/DocumentViewController.h
rename to ios/Mobile/DocumentViewController.h
diff --git a/Mobile/Mobile/DocumentViewController.mm b/ios/Mobile/DocumentViewController.mm
similarity index 100%
rename from Mobile/Mobile/DocumentViewController.mm
rename to ios/Mobile/DocumentViewController.mm
diff --git a/Mobile/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
similarity index 100%
rename from Mobile/Mobile/Info.plist.in
rename to ios/Mobile/Info.plist.in
diff --git a/Mobile/Mobile/Mobile.entitlements b/ios/Mobile/Mobile.entitlements
similarity index 100%
rename from Mobile/Mobile/Mobile.entitlements
rename to ios/Mobile/Mobile.entitlements
diff --git a/Mobile/Mobile/main.m b/ios/Mobile/main.m
similarity index 100%
rename from Mobile/Mobile/main.m
rename to ios/Mobile/main.m
diff --git a/Mobile/README b/ios/README
similarity index 100%
rename from Mobile/README
rename to ios/README
diff --git a/Mobile/TestFakeSocket/TestFakeSocket.xcodeproj/project.pbxproj b/ios/TestFakeSocket/TestFakeSocket.xcodeproj/project.pbxproj
similarity index 100%
rename from Mobile/TestFakeSocket/TestFakeSocket.xcodeproj/project.pbxproj
rename to ios/TestFakeSocket/TestFakeSocket.xcodeproj/project.pbxproj
diff --git a/Mobile/TestFakeSocket/TestFakeSocket/main.mm b/ios/TestFakeSocket/TestFakeSocket/main.mm
similarity index 100%
rename from Mobile/TestFakeSocket/TestFakeSocket/main.mm
rename to ios/TestFakeSocket/TestFakeSocket/main.mm

More information about the Libreoffice-commits mailing list