Offline Builds initial draft

Shchvova · Shchvova · Feb 27, 2020 · Mar 4, 2020 · Mar 10, 2020 · Mar 10, 2020
commit b7562a5152a9fe9c826e257e3987776adec65e44
diff --git a/.gitignore b/.gitignore
@@ -267,5 +267,6 @@ external/facebook-ios-sdk
 external/facebook-android-sdk
 plugins/ads-inmobi
 plugins/ads-inneractive
-tools/buildsys-ios
 commit-email.sh
+platform/resources/iostemplate
+platform/tvos/license.ccdata
diff --git a/platform/android/app/build.gradle.kts b/platform/android/app/build.gradle.kts
diff --git a/platform/android/build.gradle.kts b/platform/android/build.gradle.kts
@@ -5,7 +5,6 @@ buildscript {
     }
     dependencies {
         classpath("com.android.tools.build:gradle:3.5.3")
-        classpath("de.undercouch:gradle-download-task:3.4.3")
         classpath("com.beust:klaxon:5.0.1")
     }
 }

diff --git a/platform/iphone/mks3upload b/platform/iphone/mks3upload
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 #
 # mks3upload
 #
@@ -85,3 +85,12 @@ if [ -d $AS2BACKUP ]
 then
 	mv $AS2BACKUP $ASSETS2 
 fi
+
+for IOS_VER in template/iphone/*
+do
+	IOS_VER=$(basename "${IOS_VER}")
+
+	cp "2100.9999_template_iphone_${IOS_VER}_basic.tar.bz" "../resources/iostemplate/iphoneos_${IOS_VER}.tar.bz"
+	cp "2100.9999_template_iphone-sim_${IOS_VER}_basic.tar.bz" "../resources/iostemplate/iphonesimulator_${IOS_VER}.tar.bz"
+
+done
diff --git a/platform/mac/AndroidAppBuildController.mm b/platform/mac/AndroidAppBuildController.mm
@@ -120,21 +120,26 @@ - (void) showWindow:(id)sender;
 	{
 		// Generate a default package id based on the user's email address + the app name
 		const Rtt::AuthorizationTicket *ticket = [appDelegate ticket];
-		NSString *username = [NSString stringWithExternalString:ticket->GetUsername()];
-		NSArray *nameComponents = [username componentsSeparatedByCharactersInSet:[[NSCharacterSet alphanumericCharacterSet] invertedSet]];
+		NSString *tmpPackageName;
+		if(ticket) {
+			NSString *username = [NSString stringWithExternalString:ticket->GetUsername()];
+			NSArray *nameComponents = [username componentsSeparatedByCharactersInSet:[[NSCharacterSet alphanumericCharacterSet] invertedSet]];
 
-		NSMutableString *tmpPackageName = [[[NSMutableString alloc] init] autorelease];
+			tmpPackageName = [[[NSMutableString alloc] init] autorelease];
 
-		// Reverse the order of the components of the email address and concatenate them together
-		// separated by periods for something like: com.coronalabs.perry.MyNewApp
-		for (id component in [nameComponents reverseObjectEnumerator])
-		{
-			[tmpPackageName appendString:component];
-			[tmpPackageName appendString:@"."];
-		}
+			// Reverse the order of the components of the email address and concatenate them together
+			// separated by periods for something like: com.coronalabs.perry.MyNewApp
+			for (id component in [nameComponents reverseObjectEnumerator])
+			{
+				[tmpPackageName appendString:component];
+				[tmpPackageName appendString:@"."];
+			}
 
-		// Add the appname having replaced any non-alphanumerics with underscores
-		[tmpPackageName appendString:[[self.appName componentsSeparatedByCharactersInSet:[[NSCharacterSet alphanumericCharacterSet] invertedSet]] componentsJoinedByString:@"_"]];
+			// Add the appname having replaced any non-alphanumerics with underscores
+			[tmpPackageName appendString:[[self.appName componentsSeparatedByCharactersInSet:[[NSCharacterSet alphanumericCharacterSet] invertedSet]] componentsJoinedByString:@"_"]];
+		} else {
+			tmpPackageName = [@"com.coronalabs." stringByAppendingString:[[self.appName componentsSeparatedByCharactersInSet:[[NSCharacterSet alphanumericCharacterSet] invertedSet]] componentsJoinedByString:@"_"]];
+		}
 
 		self.androidAppPackage = tmpPackageName;
 	}

diff --git a/platform/mac/AppBuildController.mm b/platform/mac/AppBuildController.mm
@@ -1115,9 +1115,12 @@ - (void) restoreBuildPreferences
 
 - (BOOL) loginSession:(WebServicesSession *)session services:(MacPlatformServices *)services ticket:(const AuthorizationTicket *)ticket message:(NSString **)message
 {
-    Rtt_ASSERT(session);
+	Rtt_ASSERT(session);
     Rtt_ASSERT(services);
-    Rtt_ASSERT(ticket);
+
+    if(!ticket && services) {
+		return session && session->IsOfflineSession();
+	}
 
     const char* usr = ticket->GetUsername();
     Rtt::String encryptedPassword;

diff --git a/platform/mac/AppDelegate.h b/platform/mac/AppDelegate.h
@@ -178,6 +178,8 @@ namespace Rtt
 @property (nonatomic, readwrite) BOOL respondsToBackKey;
 @property (nonatomic, readonly, getter=analytics) Rtt::SimulatorAnalytics *fAnalytics;
 
++(BOOL)offlineModeAllowed;
+
 -(BOOL)isRunning;
 -(IBAction)showHelp:(id)sender;
 -(void)signin;

diff --git a/platform/mac/AppDelegate.mm b/platform/mac/AppDelegate.mm
@@ -595,6 +595,11 @@ @implementation AppDelegate
 @synthesize _currentLocation;
 @synthesize fAnalytics;
 
++(BOOL)offlineModeAllowed {
+	static BOOL allowed = [[NSUserDefaults standardUserDefaults] boolForKey:@"allowOfflineMode"];
+	return allowed;
+}
+
 -(id)init
 {
 	self = [super init];
@@ -855,16 +860,25 @@ -(void)signin
 
 		if ( ! authorizer.Initialize(true) )
 		{
-			NSRunAlertPanel( @"Could not authorize this computer to use Corona Simulator", @"An Internet connection is required to authorize first time use.", nil, nil, nil );
-
-			[[NSApplication sharedApplication] terminate:self];
+			if(![AppDelegate offlineModeAllowed])
+			{
 
-			return;
+				NSRunAlertPanel( @"Could not authorize this computer to use Corona Simulator", @"An Internet connection is required to authorize first time use.", nil, nil, nil );
+
+				[[NSApplication sharedApplication] terminate:self];
+
+				return;
+			}
 		}
 
         ticket = authorizer.GetTicket();
+
+		if(!ticket && [AppDelegate offlineModeAllowed]) {
+			authorizedToLaunch = YES;
+			return;
+		}
 
-		if ( ! authorizer.VerifyTicket() )
+		if ( ticket && ! authorizer.VerifyTicket() )
 		{
 			NSRunAlertPanel( @"Could not launch Corona Simulator", @"Invalid registration.", nil, nil, nil );
 
@@ -1587,6 +1601,7 @@ -(NSArray*)GetRecentDocuments
 // I believe this is generally safe enough because awakeFromNib gets called before applicationWillFinishLaunching.
 -(void)applicationWillFinishLaunching:(NSNotification*)aNotification
 {
+
 	// Set up the ticket subsystem
 	fServices = new Rtt::MacPlatformServices( *fConsolePlatform );
 	fAuthorizerDelegate = new Rtt::MacAuthorizationDelegate;
@@ -1848,7 +1863,7 @@ - (void)applicationWillResignActive:(NSNotification *)aNotification
 static bool
 IsAppAllowedToRun( const Rtt::AuthorizationTicket* t )
 {
-	return t && t->IsAppAllowedToRun();
+	return [AppDelegate offlineModeAllowed] || (t && t->IsAppAllowedToRun());
 }
 
 -(BOOL)isRunnable
@@ -2099,7 +2114,7 @@ - (NSString*) preferencesUserName
 	const Rtt::AuthorizationTicket* ticket = [self ticket];
 	if ( NULL == ticket )
 	{
-		return nil;
+		return @"<offline user>";
 	}
 
 	const char* label = ticket->GetUsername();
@@ -2127,7 +2142,7 @@ -(void)deauthorize:(id)sender
 
 	// If we're connected to the internet, try to deauth this computer with the server so we don't burn one
 	// of their (many) authorization slots.  We don't bug the user if this doesn't work.
-	if ( services.IsInternetAvailable() )
+	if ( services.IsInternetAvailable() && ticket )
 	{
 		const char *usr = ticket->GetUsername();
 		Rtt::String encryptedPassword;
@@ -2149,6 +2164,7 @@ -(void)deauthorize:(id)sender
 	services.SetPreference( Authorization::kTicketKey, NULL );
 	services.SetPreference( Authorization::kSuppressFeedbackKey, NULL );
 	services.SetPreference( Authorization::kUsernameKey, NULL );
+	services.SetLibraryPreference( Authorization::kOfflineModeConfirmed, NULL );
 
 	if (ticket != NULL)
 	{

diff --git a/platform/mac/CoronaBuilder.xcodeproj/project.pbxproj b/platform/mac/CoronaBuilder.xcodeproj/project.pbxproj
@@ -135,8 +135,10 @@
 		C2CF9BA01AE5BFFC00A9A64A /* AndroidValidation.lua in CopyFiles */ = {isa = PBXBuildFile; fileRef = C2C5359D1AE5B8A200BF7A6E /* AndroidValidation.lua */; };
 		C2F98DF41BB34C4600BDE58B /* XMLRPC.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = C2F98DEC1BB34B8100BDE58B /* XMLRPC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		C2F98DF51BB34C4C00BDE58B /* XMLRPC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2F98DEC1BB34B8100BDE58B /* XMLRPC.framework */; };
+		F53C329F2404E30900BC2BED /* CoronaBuilderPluginCollector.lua in Sources */ = {isa = PBXBuildFile; fileRef = F53C328E2404E2C000BC2BED /* CoronaBuilderPluginCollector.lua */; };
 		F547C7F61ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F547C7F41ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.cpp */; };
 		F547C7F71ED28BA600C4ED92 /* BuilderPluginDownloader.lua in Sources */ = {isa = PBXBuildFile; fileRef = F547C7ED1ED289EA00C4ED92 /* BuilderPluginDownloader.lua */; };
+		F5BEA4B823FFE98200206A6A /* CoronaOfflineiOSPackager.lua in Sources */ = {isa = PBXBuildFile; fileRef = F5BEA4A723FFE97300206A6A /* CoronaOfflineiOSPackager.lua */; };
 		F5DB5B312113702800EC5CBC /* linuxPackageApp.lua in Sources */ = {isa = PBXBuildFile; fileRef = F5DB5B202113701300EC5CBC /* linuxPackageApp.lua */; };
 		F5FBD1CE20696145009A9D32 /* Rtt_WebAppPackager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5FBD1CC20696145009A9D32 /* Rtt_WebAppPackager.cpp */; };
 		F5FBD1DB206961A4009A9D32 /* libluasocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C221F5231D48156700F45E77 /* libluasocket.a */; };
@@ -634,9 +636,11 @@
 		C2F1BAF71EF48EF500D77BD7 /* CoronaShell.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CoronaShell.xcodeproj; path = CoronaShell/CoronaShell.xcodeproj; sourceTree = "<group>"; };
 		C2F1BAFD1EF48F2F00D77BD7 /* ratatouille.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = ratatouille.xcodeproj; sourceTree = "<group>"; };
 		C2F98DE61BB34B8000BDE58B /* XMLRPC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = XMLRPC.xcodeproj; path = "../../external/osx-xmlrpc/XMLRPC/XMLRPC.xcodeproj"; sourceTree = "<group>"; };
+		F53C328E2404E2C000BC2BED /* CoronaBuilderPluginCollector.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CoronaBuilderPluginCollector.lua; path = ../resources/CoronaBuilderPluginCollector.lua; sourceTree = "<group>"; };
 		F547C7ED1ED289EA00C4ED92 /* BuilderPluginDownloader.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = BuilderPluginDownloader.lua; path = ../../tools/CoronaBuilder/BuilderPluginDownloader.lua; sourceTree = "<group>"; };
 		F547C7F41ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rtt_DownloadPluginsMain.cpp; path = ../../tools/CoronaBuilder/Rtt_DownloadPluginsMain.cpp; sourceTree = "<group>"; };
 		F547C7F51ED28A2700C4ED92 /* Rtt_DownloadPluginsMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rtt_DownloadPluginsMain.h; path = ../../tools/CoronaBuilder/Rtt_DownloadPluginsMain.h; sourceTree = "<group>"; };
+		F5BEA4A723FFE97300206A6A /* CoronaOfflineiOSPackager.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CoronaOfflineiOSPackager.lua; path = ../resources/CoronaOfflineiOSPackager.lua; sourceTree = "<group>"; };
 		F5DB5B202113701300EC5CBC /* linuxPackageApp.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = linuxPackageApp.lua; path = ../resources/linuxPackageApp.lua; sourceTree = "<group>"; };
 		F5FBD1CC20696145009A9D32 /* Rtt_WebAppPackager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rtt_WebAppPackager.cpp; path = ../shared/Rtt_WebAppPackager.cpp; sourceTree = "<group>"; };
 		F5FBD1CD20696145009A9D32 /* Rtt_WebAppPackager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rtt_WebAppPackager.h; path = ../shared/Rtt_WebAppPackager.h; sourceTree = "<group>"; };
@@ -1105,6 +1109,8 @@
 				C22BAF751C1B8FBD00EF1795 /* OSXPackageApp.lua */,
 				C22BAF761C1B8FBD00EF1795 /* tvosPackageApp.lua */,
 				F5FBD1DE20696201009A9D32 /* webPackageApp.lua */,
+				F53C328E2404E2C000BC2BED /* CoronaBuilderPluginCollector.lua */,
+				F5BEA4A723FFE97300206A6A /* CoronaOfflineiOSPackager.lua */,
 			);
 			name = Lua;
 			sourceTree = "<group>";
@@ -1460,6 +1466,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F53C329F2404E30900BC2BED /* CoronaBuilderPluginCollector.lua in Sources */,
+				F5BEA4B823FFE98200206A6A /* CoronaOfflineiOSPackager.lua in Sources */,
 				F5DB5B312113702800EC5CBC /* linuxPackageApp.lua in Sources */,
 				F5FBD1E020696224009A9D32 /* webPackageApp.lua in Sources */,
 				C277D3A01EBA4CF900966BA1 /* _CoronaSetup_android.lua in Sources */,

diff --git a/platform/mac/CoronaBuilder.xcodeproj/xcshareddata/xcschemes/CoronaBuilder.xcscheme b/platform/mac/CoronaBuilder.xcodeproj/xcshareddata/xcschemes/CoronaBuilder.xcscheme
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:CoronaBuilder.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -63,28 +61,18 @@
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "plugins"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "download"
-            isEnabled = "YES">
-         </CommandLineArgument>
-         <CommandLineArgument
-            argument = "android"
+            argument = "build"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "/Users/vlad/Projects/main/platform/test/assets2/build.settings"
+            argument = "--lua"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "--android-build"
+            argument = "/Users/vlad/Desktop/recepie.lua"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/platform/mac/LinuxAppBuildController.mm b/platform/mac/LinuxAppBuildController.mm
@@ -280,7 +280,7 @@ - (IBAction)build:(id)sender
 	}
 
 	const Rtt::AuthorizationTicket *ticket = [appDelegate ticket];
-	NSString *username = [NSString stringWithExternalString:ticket->GetUsername()];
+	NSString *username = ticket?[NSString stringWithExternalString:ticket->GetUsername()]:@"anonymous@corona";
 	const char* identity = [username UTF8String];
 
 	bool useStandartResources = (fUseStandartResources.state == NSOnState);

diff --git a/platform/mac/OSXAppBuildController.mm b/platform/mac/OSXAppBuildController.mm
@@ -309,7 +309,7 @@ - (IBAction)build:(id)sender
 	}
 
 	// We don't login to build macOS apps so we output this here
-	const char* usr = [appDelegate ticket]->GetUsername();
+	const char* usr = [appDelegate ticket]?[appDelegate ticket]->GetUsername():"anonymous@corona";
 
 	Rtt_Log("Building %s app for %s with %s", [self.platformTitle UTF8String], usr, Rtt_STRING_BUILD);