From 8a2398e02339019621ad715886684efcf9ee26d1 Mon Sep 17 00:00:00 2001 From: Dave Townsend Date: Tue, 2 Apr 2019 09:07:54 -0700 Subject: [PATCH] Bug 1541086: Remove the embedding code and update the bug components for widget::headless. r=myk r=bdahl Differential Revision: https://phabricator.services.mozilla.com/D25800 --HG-- extra : rebase_source : c3ec2eec85909de82e9e2d4ef8ee77b19d4295df --- .flake8 | 1 - .gitignore | 2 - .hgignore | 2 - .../GeckoEmbed.xcodeproj/project.pbxproj | 595 ------------------ .../contents.xcworkspacedata | 7 - .../ios/GeckoEmbed/GeckoEmbed/AppDelegate.h | 15 - .../ios/GeckoEmbed/GeckoEmbed/AppDelegate.m | 53 -- .../GeckoEmbed/Base.lproj/LaunchScreen.xib | 41 -- .../GeckoEmbed/Base.lproj/Main.storyboard | 25 - .../AppIcon.appiconset/Contents.json | 68 -- .../ios/GeckoEmbed/GeckoEmbed/Info.plist | 47 -- .../GeckoEmbed/GeckoEmbed/ViewController.h | 13 - .../GeckoEmbed/GeckoEmbed/ViewController.m | 27 - .../GeckoEmbed/browser/application.ini | 10 - .../GeckoEmbed/browser/chrome.manifest | 1 - .../browser/chrome/content/hello.js | 8 - .../browser/chrome/content/hello.xul | 10 - .../browser/defaults/preferences/prefs.js | 4 - embedding/ios/GeckoEmbed/GeckoEmbed/main.mm | 93 --- embedding/ios/GeckoEmbed/build-gecko.sh | 21 - embedding/ios/GeckoEmbed/copy-jsshell.sh | 22 - .../GeckoEmbed/js/Base.lproj/LaunchScreen.xib | 41 -- .../GeckoEmbed/js/Base.lproj/Main.storyboard | 25 - .../AppIcon.appiconset/Contents.json | 68 -- embedding/ios/GeckoEmbed/js/Info.plist | 47 -- embedding/ios/GeckoEmbed/js/dirs.m | 11 - embedding/ios/GeckoEmbed/js/shell.cpp | 21 - embedding/ios/app.mozbuild | 10 - embedding/ios/build.mk | 29 - embedding/ios/confvars.sh | 8 - embedding/ios/moz.configure | 9 - embedding/moz.build | 3 - .../mozbuild/mozbuild/test/configure/lint.py | 1 - widget/headless/moz.build | 2 +- 34 files changed, 1 insertion(+), 1339 deletions(-) delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.pbxproj delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/AppDelegate.h delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/AppDelegate.m delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/Base.lproj/LaunchScreen.xib delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/Base.lproj/Main.storyboard delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/Images.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/Info.plist delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/ViewController.h delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/ViewController.m delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/browser/application.ini delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome.manifest delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome/content/hello.js delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome/content/hello.xul delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/browser/defaults/preferences/prefs.js delete mode 100644 embedding/ios/GeckoEmbed/GeckoEmbed/main.mm delete mode 100755 embedding/ios/GeckoEmbed/build-gecko.sh delete mode 100755 embedding/ios/GeckoEmbed/copy-jsshell.sh delete mode 100644 embedding/ios/GeckoEmbed/js/Base.lproj/LaunchScreen.xib delete mode 100644 embedding/ios/GeckoEmbed/js/Base.lproj/Main.storyboard delete mode 100644 embedding/ios/GeckoEmbed/js/Images.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 embedding/ios/GeckoEmbed/js/Info.plist delete mode 100644 embedding/ios/GeckoEmbed/js/dirs.m delete mode 100644 embedding/ios/GeckoEmbed/js/shell.cpp delete mode 100644 embedding/ios/app.mozbuild delete mode 100644 embedding/ios/build.mk delete mode 100644 embedding/ios/confvars.sh delete mode 100644 embedding/ios/moz.configure delete mode 100644 embedding/moz.build diff --git a/.flake8 b/.flake8 index 162e07fe0a17..05be05a88af8 100644 --- a/.flake8 +++ b/.flake8 @@ -12,7 +12,6 @@ exclude = dom/imptests, dom/security, dom/websocket, - embedding/ios/moz.configure, gfx/tests, layout/base/tests/marionette, layout/reftests/border-image, diff --git a/.gitignore b/.gitignore index 3dde8bbeec72..61a3fa251388 100644 --- a/.gitignore +++ b/.gitignore @@ -112,8 +112,6 @@ mobile/android/gradle/.gradle # XCode project cruft /*.xcodeproj/ -embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.xcworkspace/xcuserdata -embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/xcuserdata # Rust/Cargo output from running `cargo` directly /target/ diff --git a/.hgignore b/.hgignore index c8bbc585c328..b1c676feff22 100644 --- a/.hgignore +++ b/.hgignore @@ -115,8 +115,6 @@ _OPT\.OBJ/ # XCode project cruft ^[^/]*\.xcodeproj/ -^embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.xcworkspace/xcuserdata -^embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/xcuserdata # Rust/Cargo output from running `cargo` directly ^target/ diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.pbxproj b/embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.pbxproj deleted file mode 100644 index 3ee40d37b6d4..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.pbxproj +++ /dev/null @@ -1,595 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - D2669E901AD6EC830027914D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2669E8E1AD6EC830027914D /* Main.storyboard */; }; - D2669E921AD6EC830027914D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2669E911AD6EC830027914D /* Images.xcassets */; }; - D2669E951AD6EC830027914D /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2669E931AD6EC830027914D /* LaunchScreen.xib */; }; - D2C9CF2E1AA4960F0041BE29 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = D2C9CF2D1AA4960F0041BE29 /* main.mm */; }; - D2C9CF311AA4960F0041BE29 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2C9CF301AA4960F0041BE29 /* AppDelegate.m */; }; - D2C9CF341AA4960F0041BE29 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2C9CF331AA4960F0041BE29 /* ViewController.m */; }; - D2C9CF371AA4960F0041BE29 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2C9CF351AA4960F0041BE29 /* Main.storyboard */; }; - D2C9CF391AA4960F0041BE29 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2C9CF381AA4960F0041BE29 /* Images.xcassets */; }; - D2C9CF3C1AA4960F0041BE29 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2C9CF3A1AA4960F0041BE29 /* LaunchScreen.xib */; }; - D2C9CF521AA4A23A0041BE29 /* browser in Resources */ = {isa = PBXBuildFile; fileRef = D2C9CF511AA4A23A0041BE29 /* browser */; }; - D2CA73561ADDE3F10022A192 /* shell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D2CA73551ADDE3F10022A192 /* shell.cpp */; }; - D2CA73591ADDEBAB0022A192 /* dirs.m in Sources */ = {isa = PBXBuildFile; fileRef = D2CA73581ADDEBAB0022A192 /* dirs.m */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - D2669EA81AD6ECFC0027914D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = D2C9CF201AA4960F0041BE29 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D2C9CF271AA4960F0041BE29; - remoteInfo = GeckoEmbed; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - D20C8D111ADDD6E600CE4BC8 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - D20C8D121ADDD87C00CE4BC8 /* libmozglue.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmozglue.dylib; path = "../../../../debug-mozilla-central/mozglue/build/libmozglue.dylib"; sourceTree = ""; }; - D2669E821AD6EC830027914D /* js.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = js.app; sourceTree = BUILT_PRODUCTS_DIR; }; - D2669E851AD6EC830027914D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D2669E8F1AD6EC830027914D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - D2669E911AD6EC830027914D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - D2669E941AD6EC830027914D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - D2C9CF281AA4960F0041BE29 /* GeckoEmbed.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GeckoEmbed.app; sourceTree = BUILT_PRODUCTS_DIR; }; - D2C9CF2C1AA4960F0041BE29 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D2C9CF2D1AA4960F0041BE29 /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = ""; }; - D2C9CF2F1AA4960F0041BE29 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - D2C9CF301AA4960F0041BE29 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - D2C9CF321AA4960F0041BE29 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - D2C9CF331AA4960F0041BE29 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - D2C9CF361AA4960F0041BE29 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - D2C9CF381AA4960F0041BE29 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - D2C9CF3B1AA4960F0041BE29 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - D2C9CF511AA4A23A0041BE29 /* browser */ = {isa = PBXFileReference; lastKnownFileType = folder; path = browser; sourceTree = ""; }; - D2C9CF541AA4A26E0041BE29 /* libxpcomglue.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxpcomglue.a; path = "../../../../../iphone-simulator-debug/xpcom/glue/standalone/libxpcomglue.a"; sourceTree = ""; }; - D2CA73551ADDE3F10022A192 /* shell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shell.cpp; sourceTree = ""; }; - D2CA73581ADDEBAB0022A192 /* dirs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = dirs.m; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - D2669E7F1AD6EC830027914D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D2C9CF251AA4960F0041BE29 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - D2669E831AD6EC830027914D /* js */ = { - isa = PBXGroup; - children = ( - D2669E8E1AD6EC830027914D /* Main.storyboard */, - D2669E911AD6EC830027914D /* Images.xcassets */, - D2669E931AD6EC830027914D /* LaunchScreen.xib */, - D2669E841AD6EC830027914D /* Supporting Files */, - D2CA73551ADDE3F10022A192 /* shell.cpp */, - D2CA73581ADDEBAB0022A192 /* dirs.m */, - ); - path = js; - sourceTree = ""; - }; - D2669E841AD6EC830027914D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - D2669E851AD6EC830027914D /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - D2C9CF1F1AA4960F0041BE29 = { - isa = PBXGroup; - children = ( - D20C8D121ADDD87C00CE4BC8 /* libmozglue.dylib */, - D2C9CF2A1AA4960F0041BE29 /* GeckoEmbed */, - D2669E831AD6EC830027914D /* js */, - D2C9CF291AA4960F0041BE29 /* Products */, - ); - sourceTree = ""; - }; - D2C9CF291AA4960F0041BE29 /* Products */ = { - isa = PBXGroup; - children = ( - D2C9CF281AA4960F0041BE29 /* GeckoEmbed.app */, - D2669E821AD6EC830027914D /* js.app */, - ); - name = Products; - sourceTree = ""; - }; - D2C9CF2A1AA4960F0041BE29 /* GeckoEmbed */ = { - isa = PBXGroup; - children = ( - D2C9CF541AA4A26E0041BE29 /* libxpcomglue.a */, - D2C9CF511AA4A23A0041BE29 /* browser */, - D2C9CF2D1AA4960F0041BE29 /* main.mm */, - D2C9CF2F1AA4960F0041BE29 /* AppDelegate.h */, - D2C9CF301AA4960F0041BE29 /* AppDelegate.m */, - D2C9CF321AA4960F0041BE29 /* ViewController.h */, - D2C9CF331AA4960F0041BE29 /* ViewController.m */, - D2C9CF351AA4960F0041BE29 /* Main.storyboard */, - D2C9CF381AA4960F0041BE29 /* Images.xcassets */, - D2C9CF3A1AA4960F0041BE29 /* LaunchScreen.xib */, - D2C9CF2B1AA4960F0041BE29 /* Supporting Files */, - ); - path = GeckoEmbed; - sourceTree = ""; - }; - D2C9CF2B1AA4960F0041BE29 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - D2C9CF2C1AA4960F0041BE29 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - D2669E811AD6EC830027914D /* js */ = { - isa = PBXNativeTarget; - buildConfigurationList = D2669EA61AD6EC830027914D /* Build configuration list for PBXNativeTarget "js" */; - buildPhases = ( - D20C8D141ADDD97100CE4BC8 /* Sources */, - D2669E7F1AD6EC830027914D /* Frameworks */, - D2669E801AD6EC830027914D /* Resources */, - D20C8D111ADDD6E600CE4BC8 /* CopyFiles */, - D2CA73571ADDEA7A0022A192 /* Run Script */, - ); - buildRules = ( - ); - dependencies = ( - D2669EA91AD6ECFC0027914D /* PBXTargetDependency */, - ); - name = js; - productName = js; - productReference = D2669E821AD6EC830027914D /* js.app */; - productType = "com.apple.product-type.application"; - }; - D2C9CF271AA4960F0041BE29 /* GeckoEmbed */ = { - isa = PBXNativeTarget; - buildConfigurationList = D2C9CF4B1AA4960F0041BE29 /* Build configuration list for PBXNativeTarget "GeckoEmbed" */; - buildPhases = ( - D2C9CF5D1AA4A6D80041BE29 /* Run Script */, - D2C9CF241AA4960F0041BE29 /* Sources */, - D2C9CF251AA4960F0041BE29 /* Frameworks */, - D2C9CF261AA4960F0041BE29 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = GeckoEmbed; - productName = GeckoEmbed; - productReference = D2C9CF281AA4960F0041BE29 /* GeckoEmbed.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - D2C9CF201AA4960F0041BE29 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0610; - ORGANIZATIONNAME = Mozilla; - TargetAttributes = { - D2669E811AD6EC830027914D = { - CreatedOnToolsVersion = 6.1.1; - }; - D2C9CF271AA4960F0041BE29 = { - CreatedOnToolsVersion = 6.1.1; - }; - }; - }; - buildConfigurationList = D2C9CF231AA4960F0041BE29 /* Build configuration list for PBXProject "GeckoEmbed" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = D2C9CF1F1AA4960F0041BE29; - productRefGroup = D2C9CF291AA4960F0041BE29 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - D2C9CF271AA4960F0041BE29 /* GeckoEmbed */, - D2669E811AD6EC830027914D /* js */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - D2669E801AD6EC830027914D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D2669E901AD6EC830027914D /* Main.storyboard in Resources */, - D2669E951AD6EC830027914D /* LaunchScreen.xib in Resources */, - D2669E921AD6EC830027914D /* Images.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D2C9CF261AA4960F0041BE29 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D2C9CF371AA4960F0041BE29 /* Main.storyboard in Resources */, - D2C9CF3C1AA4960F0041BE29 /* LaunchScreen.xib in Resources */, - D2C9CF391AA4960F0041BE29 /* Images.xcassets in Resources */, - D2C9CF521AA4A23A0041BE29 /* browser in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - D2C9CF5D1AA4A6D80041BE29 /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/bash; - shellScript = "${SRCROOT}/build-gecko.sh"; - }; - D2CA73571ADDEA7A0022A192 /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "${SRCROOT}/copy-jsshell.sh"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - D20C8D141ADDD97100CE4BC8 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D2CA73561ADDE3F10022A192 /* shell.cpp in Sources */, - D2CA73591ADDEBAB0022A192 /* dirs.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - D2C9CF241AA4960F0041BE29 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D2C9CF341AA4960F0041BE29 /* ViewController.m in Sources */, - D2C9CF311AA4960F0041BE29 /* AppDelegate.m in Sources */, - D2C9CF2E1AA4960F0041BE29 /* main.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - D2669EA91AD6ECFC0027914D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D2C9CF271AA4960F0041BE29 /* GeckoEmbed */; - targetProxy = D2669EA81AD6ECFC0027914D /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - D2669E8E1AD6EC830027914D /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - D2669E8F1AD6EC830027914D /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - D2669E931AD6EC830027914D /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - D2669E941AD6EC830027914D /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; - D2C9CF351AA4960F0041BE29 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - D2C9CF361AA4960F0041BE29 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - D2C9CF3A1AA4960F0041BE29 /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - D2C9CF3B1AA4960F0041BE29 /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - D2669EA21AD6EC830027914D /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - GCC_PREPROCESSOR_DEFINITIONS = ( - "IMPL_MFBT=1", - "EXPORT_JS_API=1", - "DEBUG=1", - "MOZILLA_CLIENT=1", - ); - INFOPLIST_FILE = js/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(GECKO_OBJDIR)/config/external/nss", - "$(GECKO_OBJDIR)/mozglue/build", - "$(GECKO_OBJDIR)/js/src", - "$(GECKO_OBJDIR)/js/src/editline", - ); - OTHER_CPLUSPLUSFLAGS = ( - "$(OTHER_CFLAGS)", - "-include", - "$(GECKO_OBJDIR)/js/src/js-confdefs.h", - ); - OTHER_LDFLAGS = ( - "-ljs_static", - "-lmozglue", - "-lnss3", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(GECKO_OBJDIR)/dist/include/nspr $(GECKO_OBJDIR)/dist/include $(SRCROOT)/../../../js/src $(SRCROOT)/../../../js/src/shell $(SRCROOT)/../../../js/src/editline"; - }; - name = Debug; - }; - D2669EA31AD6EC830027914D /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - GCC_PREPROCESSOR_DEFINITIONS = ( - "IMPL_MFBT=1", - "EXPORT_JS_API=1", - "MOZILLA_CLIENT=1", - ); - INFOPLIST_FILE = js/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(GECKO_OBJDIR)/config/external/nss", - "$(GECKO_OBJDIR)/mozglue/build", - "$(GECKO_OBJDIR)/js/src", - "$(GECKO_OBJDIR)/js/src/editline", - ); - OTHER_CPLUSPLUSFLAGS = ( - "$(OTHER_CFLAGS)", - "-include", - "$(GECKO_OBJDIR)/js/src/js-confdefs.h", - ); - OTHER_LDFLAGS = ( - "-ljs_static", - "-lmozglue", - "-lnss3", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(GECKO_OBJDIR)/dist/include/nspr $(GECKO_OBJDIR)/dist/include $(SRCROOT)/../../../js/src $(SRCROOT)/../../../js/src/shell $(SRCROOT)/../../../js/src/editline"; - }; - name = Release; - }; - D2C9CF491AA4960F0041BE29 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphoneos*]" = armv7; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - GECKO_OBJDIR = ""; - "GECKO_OBJDIR[sdk=iphoneos*]" = "$(SRCROOT)/../../../../iphone-device-debug/"; - "GECKO_OBJDIR[sdk=iphonesimulator*]" = "$(SRCROOT)/../../../../iphone-simulator-debug/"; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - D2C9CF4A1AA4960F0041BE29 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphoneos*]" = armv7; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - GECKO_OBJDIR = ""; - "GECKO_OBJDIR[sdk=iphoneos*]" = "$(SRCROOT)/../../../../iphone-device-opt/"; - "GECKO_OBJDIR[sdk=iphonesimulator*]" = "$(SRCROOT)/../../../../iphone-simulator-opt/"; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - D2C9CF4C1AA4960F0041BE29 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphoneos*]" = armv7; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GECKO_OBJDIR = ""; - "GECKO_OBJDIR[sdk=iphoneos*]" = "$(SRCROOT)/../../../../iphone-device-debug/"; - "GECKO_OBJDIR[sdk=iphonesimulator*]" = "$(SRCROOT)/../../../../iphone-simulator-debug/"; - INFOPLIST_FILE = GeckoEmbed/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(GECKO_OBJDIR)/dist/lib", - "$(GECKO_OBJDIR)/mozglue/build", - "$(GECKO_OBJDIR)/xpcom/glue/standalone", - ); - OTHER_CODE_SIGN_FLAGS = ""; - OTHER_LDFLAGS = ( - "$(GECKO_OBJDIR)/xpcom/glue/standalone/libxpcomglue.a", - "$(GECKO_OBJDIR)/mozglue/build/libmozglue.dylib", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(GECKO_OBJDIR)/dist/include $(GECKO_OBJDIR)/dist/include/nspr"; - }; - name = Debug; - }; - D2C9CF4D1AA4960F0041BE29 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; - "ARCHS[sdk=iphoneos*]" = armv7; - "ARCHS[sdk=iphonesimulator*]" = "$(ARCHS_STANDARD)"; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GECKO_OBJDIR = ""; - "GECKO_OBJDIR[sdk=iphoneos*]" = "$(SRCROOT)/../../../../iphone-device-opt/"; - "GECKO_OBJDIR[sdk=iphonesimulator*]" = "$(SRCROOT)/../../../../iphone-simulator-opt/"; - INFOPLIST_FILE = GeckoEmbed/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(GECKO_OBJDIR)/dist/lib", - "$(GECKO_OBJDIR)/mozglue/build", - "$(GECKO_OBJDIR)/xpcom/glue/standalone", - ); - OTHER_CODE_SIGN_FLAGS = ""; - OTHER_LDFLAGS = ( - "$(GECKO_OBJDIR)/xpcom/glue/standalone/libxpcomglue.a", - "$(GECKO_OBJDIR)/mozglue/build/libmozglue.dylib", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - USER_HEADER_SEARCH_PATHS = "$(GECKO_OBJDIR)/dist/include $(GECKO_OBJDIR)/dist/include/nspr"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - D2669EA61AD6EC830027914D /* Build configuration list for PBXNativeTarget "js" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D2669EA21AD6EC830027914D /* Debug */, - D2669EA31AD6EC830027914D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - D2C9CF231AA4960F0041BE29 /* Build configuration list for PBXProject "GeckoEmbed" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D2C9CF491AA4960F0041BE29 /* Debug */, - D2C9CF4A1AA4960F0041BE29 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - D2C9CF4B1AA4960F0041BE29 /* Build configuration list for PBXNativeTarget "GeckoEmbed" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D2C9CF4C1AA4960F0041BE29 /* Debug */, - D2C9CF4D1AA4960F0041BE29 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = D2C9CF201AA4960F0041BE29 /* Project object */; -} diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index a060b27f331b..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/AppDelegate.h b/embedding/ios/GeckoEmbed/GeckoEmbed/AppDelegate.h deleted file mode 100644 index d6627266f64b..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/AppDelegate.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// AppDelegate.h -// GeckoEmbed -// -// Created by Ted Mielczarek on 3/2/15. -// Copyright (c) 2015 Mozilla. All rights reserved. -// - -#import - -@interface AppDelegate : UIResponder - -@property(strong, nonatomic) UIWindow *window; - -@end diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/AppDelegate.m b/embedding/ios/GeckoEmbed/GeckoEmbed/AppDelegate.m deleted file mode 100644 index b6ec7b261d35..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/AppDelegate.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// AppDelegate.m -// GeckoEmbed -// -// Created by Ted Mielczarek on 3/2/15. -// Copyright (c) 2015 Mozilla. All rights reserved. -// - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for - // certain types of temporary interruptions (such as an incoming phone call or SMS message) or - // when the user quits the application and it begins the transition to the background state. Use - // this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. - // Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store - // enough application state information to restore your application to its current state in case - // it is terminated later. If your application supports background execution, this method is - // called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo - // many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If - // the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also - // applicationDidEnterBackground:. -} - -@end diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/Base.lproj/LaunchScreen.xib b/embedding/ios/GeckoEmbed/GeckoEmbed/Base.lproj/LaunchScreen.xib deleted file mode 100644 index a00bb55e5e32..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/Base.lproj/Main.storyboard b/embedding/ios/GeckoEmbed/GeckoEmbed/Base.lproj/Main.storyboard deleted file mode 100644 index f56d2f3bb56e..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/Base.lproj/Main.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/Images.xcassets/AppIcon.appiconset/Contents.json b/embedding/ios/GeckoEmbed/GeckoEmbed/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 36d2c80d8893..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/Info.plist b/embedding/ios/GeckoEmbed/GeckoEmbed/Info.plist deleted file mode 100644 index 758a02b683c2..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/Info.plist +++ /dev/null @@ -1,47 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - org.mozilla.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 2 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/ViewController.h b/embedding/ios/GeckoEmbed/GeckoEmbed/ViewController.h deleted file mode 100644 index 0c8985b0dc27..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/ViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// ViewController.h -// GeckoEmbed -// -// Created by Ted Mielczarek on 3/2/15. -// Copyright (c) 2015 Mozilla. All rights reserved. -// - -#import - -@interface ViewController : UIViewController - -@end diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/ViewController.m b/embedding/ios/GeckoEmbed/GeckoEmbed/ViewController.m deleted file mode 100644 index d010fc2c9db9..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/ViewController.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// ViewController.m -// GeckoEmbed -// -// Created by Ted Mielczarek on 3/2/15. -// Copyright (c) 2015 Mozilla. All rights reserved. -// - -#import "ViewController.h" - -@interface ViewController () - -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -@end diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/application.ini b/embedding/ios/GeckoEmbed/GeckoEmbed/browser/application.ini deleted file mode 100644 index 8f2c2248c557..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/application.ini +++ /dev/null @@ -1,10 +0,0 @@ -[App] -Vendor=Mozilla -Name=browser -Version=1.0 -BuildID=20150209 -ID=browser@mozilla.org - -[Gecko] -MinVersion=34 -MaxVersion=1000 diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome.manifest b/embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome.manifest deleted file mode 100644 index e2a1c35920ef..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome.manifest +++ /dev/null @@ -1 +0,0 @@ -content mybrowser file:chrome/content/ \ No newline at end of file diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome/content/hello.js b/embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome/content/hello.js deleted file mode 100644 index 46924bb98f9c..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome/content/hello.js +++ /dev/null @@ -1,8 +0,0 @@ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); -addEventListener("DOMContentLoaded", function loaded() { - removeEventListener("DOMContentLoaded", loaded); - var b = document.getElementById("browser"); - Services.obs.notifyObservers(b.docShell, - "geckoembed-browser-loaded"); - b.loadURI("http://people.mozilla.org/~tmielczarek/iosstart.html"); -}); diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome/content/hello.xul b/embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome/content/hello.xul deleted file mode 100644 index 7744ff3a6820..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/chrome/content/hello.xul +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/defaults/preferences/prefs.js b/embedding/ios/GeckoEmbed/GeckoEmbed/browser/defaults/preferences/prefs.js deleted file mode 100644 index 124a79b02fd0..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/browser/defaults/preferences/prefs.js +++ /dev/null @@ -1,4 +0,0 @@ -pref("toolkit.defaultChromeURI", "chrome://mybrowser/content/hello.xul"); -pref("browser.dom.window.dump.enabled", true); -pref("devtools.console.stdout.chrome", true); -pref("dom.max_script_run_time", 0); diff --git a/embedding/ios/GeckoEmbed/GeckoEmbed/main.mm b/embedding/ios/GeckoEmbed/GeckoEmbed/main.mm deleted file mode 100644 index 88544bacb4a3..000000000000 --- a/embedding/ios/GeckoEmbed/GeckoEmbed/main.mm +++ /dev/null @@ -1,93 +0,0 @@ -// -// main.m -// XulRunner -// -// Created by Ted Mielczarek on 2/9/15. -// Copyright (c) 2015 Mozilla. All rights reserved. -// - -#import - -#include "mozilla-config.h" -#define XPCOM_GLUE 1 -#include "nsXULAppAPI.h" -#include "nsXPCOMGlue.h" -#include "nsXREAppData.h" -#include "mozilla/AppData.h" -#include "nsCOMPtr.h" -#include "nsIFile.h" -#include "nsIPrefService.h" -#include "nsServiceManagerUtils.h" - -static const nsXREAppData sAppData = {sizeof(nsXREAppData), - nullptr, // directory - "Mozilla", - "Browser", - nullptr, - "38.0a1", - "201502090123", - "browser@mozilla.org", - nullptr, // copyright - 0, - nullptr, // xreDirectory - "38.0a1", - "*", - "https://crash-reports.mozilla.com/submit", - nullptr, - "Firefox"}; - -XRE_GetFileFromPathType XRE_GetFileFromPath; -XRE_CreateAppDataType XRE_CreateAppData; -XRE_FreeAppDataType XRE_FreeAppData; -XRE_mainType XRE_main; - -static const nsDynamicFunctionLoad kXULFuncs[] = { - {"XRE_GetFileFromPath", (NSFuncPtr*)&XRE_GetFileFromPath}, - {"XRE_CreateAppData", (NSFuncPtr*)&XRE_CreateAppData}, - {"XRE_FreeAppData", (NSFuncPtr*)&XRE_FreeAppData}, - {"XRE_main", (NSFuncPtr*)&XRE_main}, - {nullptr, nullptr}}; - -const int MAXPATHLEN = 1024; -const char* XPCOM_DLL = "XUL"; - -int main(int argc, char* argv[]) { - char exeDir[MAXPATHLEN]; - NSString* bundlePath = [[NSBundle mainBundle] bundlePath]; - strncpy(exeDir, [bundlePath UTF8String], MAXPATHLEN); - strcat(exeDir, "/Frameworks/"); - strncat(exeDir, XPCOM_DLL, MAXPATHLEN - strlen(exeDir)); - - nsresult rv = XPCOMGlueStartup(exeDir); - if (NS_FAILED(rv)) { - printf("Couldn't load XPCOM (0x%08x) from %s\n", rv, exeDir); - return 255; - } - - rv = XPCOMGlueLoadXULFunctions(kXULFuncs); - if (NS_FAILED(rv)) { - printf("Couldn't load XRE functions.\n"); - return 255; - } - - mozilla::ScopedAppData appData(&sAppData); - - nsCOMPtr greDir; - rv = NS_NewNativeLocalFile(nsDependentCString([bundlePath UTF8String]), true, - getter_AddRefs(greDir)); - if (NS_FAILED(rv)) { - printf("Couldn't find the application directory.\n"); - return 255; - } - - nsCOMPtr appSubdir; - greDir->Clone(getter_AddRefs(appSubdir)); - greDir->Append(NS_LITERAL_STRING("Frameworks")); - appSubdir->Append(NS_LITERAL_STRING("browser")); - - mozilla::SetStrongPtr(appData.directory, static_cast(appSubdir.get())); - greDir.forget(&appData.xreDirectory); - - int result = XRE_main(argc, argv, &appData); - return result; -} diff --git a/embedding/ios/GeckoEmbed/build-gecko.sh b/embedding/ios/GeckoEmbed/build-gecko.sh deleted file mode 100755 index 1475fa916eaa..000000000000 --- a/embedding/ios/GeckoEmbed/build-gecko.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -e - -if test "${ACTION}" != "clean"; then - echo "Building in ${GECKO_OBJDIR}" - make -j8 -s -C $GECKO_OBJDIR binaries - - echo "Copying files from ${GECKO_OBJDIR}/dist/bin" - rsync -pvtrlL --exclude "Test*" \ - --exclude "test_*" --exclude "*_unittest" \ - --exclude xulrunner \ - ${GECKO_OBJDIR}/dist/bin/ $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Frameworks - - if test ${ARCHS} == "armv7"; then - for x in $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Frameworks/*.dylib $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Frameworks/XUL; do - echo "Signing $x" - /usr/bin/codesign --force --sign "${EXPANDED_CODE_SIGN_IDENTITY}" --preserve-metadata=identifier,entitlements,resource-rules $x - done - fi -fi diff --git a/embedding/ios/GeckoEmbed/copy-jsshell.sh b/embedding/ios/GeckoEmbed/copy-jsshell.sh deleted file mode 100755 index a2e9c5d6e5cc..000000000000 --- a/embedding/ios/GeckoEmbed/copy-jsshell.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -e - -if test -z ${GECKO_OBJDIR}; then - echo "Error: GECKO_OBJDIR not set!" - exit 1 -fi - -if test "${ACTION}" != "clean"; then - echo "Copying files from ${GECKO_OBJDIR}/dist/bin" - mkdir -p $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Frameworks - cp ${GECKO_OBJDIR}/mozglue/build/libmozglue.dylib $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Frameworks - cp ${GECKO_OBJDIR}/config/external/nss/libnss3.dylib $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Frameworks - - if test ${ARCHS} == "armv7"; then - for x in $BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Frameworks/*.dylib; do - echo "Signing $x" - /usr/bin/codesign --force --sign "${EXPANDED_CODE_SIGN_IDENTITY}" --preserve-metadata=identifier,entitlements,resource-rules $x - done - fi -fi diff --git a/embedding/ios/GeckoEmbed/js/Base.lproj/LaunchScreen.xib b/embedding/ios/GeckoEmbed/js/Base.lproj/LaunchScreen.xib deleted file mode 100644 index 50022f3d3d69..000000000000 --- a/embedding/ios/GeckoEmbed/js/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/embedding/ios/GeckoEmbed/js/Base.lproj/Main.storyboard b/embedding/ios/GeckoEmbed/js/Base.lproj/Main.storyboard deleted file mode 100644 index f56d2f3bb56e..000000000000 --- a/embedding/ios/GeckoEmbed/js/Base.lproj/Main.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/embedding/ios/GeckoEmbed/js/Images.xcassets/AppIcon.appiconset/Contents.json b/embedding/ios/GeckoEmbed/js/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 36d2c80d8893..000000000000 --- a/embedding/ios/GeckoEmbed/js/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/embedding/ios/GeckoEmbed/js/Info.plist b/embedding/ios/GeckoEmbed/js/Info.plist deleted file mode 100644 index e7375d54cf01..000000000000 --- a/embedding/ios/GeckoEmbed/js/Info.plist +++ /dev/null @@ -1,47 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - org.mozilla.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/embedding/ios/GeckoEmbed/js/dirs.m b/embedding/ios/GeckoEmbed/js/dirs.m deleted file mode 100644 index 6f03a7af7aac..000000000000 --- a/embedding/ios/GeckoEmbed/js/dirs.m +++ /dev/null @@ -1,11 +0,0 @@ -#import - -bool GetDocumentsDirectory(char* dir) { - NSSearchPathDirectory directory = NSDocumentDirectory; - NSArray* paths = NSSearchPathForDirectoriesInDomains(directory, NSUserDomainMask, YES); - if ([paths count] == 0) { - return false; - } - strcpy(dir, [[paths objectAtIndex:0] UTF8String]); - return true; -} diff --git a/embedding/ios/GeckoEmbed/js/shell.cpp b/embedding/ios/GeckoEmbed/js/shell.cpp deleted file mode 100644 index 51e24eaccfa7..000000000000 --- a/embedding/ios/GeckoEmbed/js/shell.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "OSObject.cpp" -#include "jsoptparse.cpp" -#define main shell_main -#include "js.cpp" -#undef main - -#include - -extern "C" bool GetDocumentsDirectory(char* dir); - -// Fake editline -char* readline(const char* prompt) { return nullptr; } - -void add_history(char* line) {} - -int main(int argc, char** argv, char** envp) { - char dir[1024]; - GetDocumentsDirectory(dir); - chdir(dir); - return shell_main(argc, argv, envp); -} diff --git a/embedding/ios/app.mozbuild b/embedding/ios/app.mozbuild deleted file mode 100644 index 5168ced1434b..000000000000 --- a/embedding/ios/app.mozbuild +++ /dev/null @@ -1,10 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include('/toolkit/toolkit.mozbuild') - -if CONFIG['MOZ_EXTENSIONS']: - DIRS += ['/extensions'] diff --git a/embedding/ios/build.mk b/embedding/ios/build.mk deleted file mode 100644 index 017f3dff1ca6..000000000000 --- a/embedding/ios/build.mk +++ /dev/null @@ -1,29 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -installer: - -package: - -package-compare: - -stage-package: - -sdk: - -install:: - -clean:: - -distclean:: - -source-package:: - -upload:: - -source-upload:: - -hg-bundle:: - -l10n-check:: diff --git a/embedding/ios/confvars.sh b/embedding/ios/confvars.sh deleted file mode 100644 index c4d7de862da2..000000000000 --- a/embedding/ios/confvars.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -MOZ_APP_NAME=geckoembed -MOZ_APP_DISPLAYNAME=GeckoEmbed -MOZ_UPDATER= diff --git a/embedding/ios/moz.configure b/embedding/ios/moz.configure deleted file mode 100644 index 00849b08b79e..000000000000 --- a/embedding/ios/moz.configure +++ /dev/null @@ -1,9 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -imply_option('MOZ_PLACES', True) -imply_option('MOZ_SERVICES_HEALTHREPORT', True) -imply_option('MOZ_SERVICES_SYNC', True) diff --git a/embedding/moz.build b/embedding/moz.build deleted file mode 100644 index 46959a3abc5b..000000000000 --- a/embedding/moz.build +++ /dev/null @@ -1,3 +0,0 @@ -with Files("**"): - BUG_COMPONENT = ("Core", "General") - diff --git a/python/mozbuild/mozbuild/test/configure/lint.py b/python/mozbuild/mozbuild/test/configure/lint.py index 98f5f4fe7bf8..9bc5add09c31 100644 --- a/python/mozbuild/mozbuild/test/configure/lint.py +++ b/python/mozbuild/mozbuild/test/configure/lint.py @@ -28,7 +28,6 @@ class LintMeta(type): for project in ( 'browser', - 'embedding/ios', 'extensions', 'js', 'memory', diff --git a/widget/headless/moz.build b/widget/headless/moz.build index 42d3299075c4..d389a284680d 100644 --- a/widget/headless/moz.build +++ b/widget/headless/moz.build @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. with Files("**"): - BUG_COMPONENT = ("Core", "Widget") + BUG_COMPONENT = ("Firefox", "Headless") DIRS += ['tests']