Browse Source

Windows deployment updates

JoshEngebretson 10 years ago
parent
commit
17be0163a8

+ 0 - 3
Script/tsconfig.json

@@ -12,8 +12,5 @@
     "filesGlob": [
     "filesGlob": [
         "./ToolCore/**/*.ts",
         "./ToolCore/**/*.ts",
         "./AtomicEditor/**/*.ts"
         "./AtomicEditor/**/*.ts"
-    ],
-    "files": [
-
     ]
     ]
 }
 }

+ 2 - 2
Source/ToolCore/Build/BuildAndroid.cpp

@@ -235,8 +235,8 @@ void BuildAndroid::RunAntDebug()
     // C:\ProgramData\Oracle\Java\javapath;
     // C:\ProgramData\Oracle\Java\javapath;
     Vector<String> args;
     Vector<String> args;
     String antCommand = "cmd";
     String antCommand = "cmd";
-    String antPath = prefs->GetAntPath() + "/ant.bat";
-    env["JAVA_HOME"] = prefs->GetJDKRootPath().CString();
+    String antPath = tprefs->GetAntPath() + "/ant.bat";
+    env["JAVA_HOME"] = tprefs->GetJDKRootPath().CString();
     // ant is a batch file on windows, so have to run with cmd /c
     // ant is a batch file on windows, so have to run with cmd /c
     args.Push("/c");
     args.Push("/c");
     args.Push("\"" + antPath + "\"");
     args.Push("\"" + antPath + "\"");

+ 0 - 52
Source/ToolCore/Build/BuildWindows.cpp

@@ -78,56 +78,4 @@ void BuildWindows::Build(const String& buildPath)
 
 
 }
 }
 
 
-
-
-/*
-void BuildWindows::Build(const String& buildPath)
-{
-    ToolSystem* tsystem = GetSubsystem<ToolSystem>();
-
-    buildPath_ = AddTrailingSlash(buildPath) + GetBuildSubfolder();
-
-    Initialize();
-
-    BuildSystem* buildSystem = GetSubsystem<BuildSystem>();
-
-    FileSystem* fileSystem = GetSubsystem<FileSystem>();
-    if (fileSystem->DirExists(buildPath_))
-        fileSystem->RemoveDir(buildPath_, true);
-
-    String dataPath = tsystem->GetDataPath();
-
-    String appSrcPath = dataPath + "Deployment/MacOS/AtomicPlayer.app";
-
-    fileSystem->CreateDir(buildPath_);
-
-    buildPath_ += "/AtomicPlayer.app";
-
-    fileSystem->CreateDir(buildPath_);
-
-    fileSystem->CreateDir(buildPath_ + "/Contents");
-    fileSystem->CreateDir(buildPath_ + "/Contents/MacOS");
-    fileSystem->CreateDir(buildPath_ + "/Contents/Resources");
-
-    String resourcePackagePath = buildPath_ + "/Contents/Resources/AtomicResources.pak";
-    GenerateResourcePackage(resourcePackagePath);
-
-    fileSystem->Copy(appSrcPath + "/Contents/Resources/Atomic.icns", buildPath_ + "/Contents/Resources/Atomic.icns");
-
-    fileSystem->Copy(appSrcPath + "/Contents/Info.plist", buildPath_ + "/Contents/Info.plist");
-    fileSystem->Copy(appSrcPath + "/Contents/MacOS/AtomicPlayer", buildPath_ + "/Contents/MacOS/AtomicPlayer");
-
-#ifdef ATOMIC_PLATFORM_OSX
-    Vector<String> args;
-    args.Push("+x");
-    args.Push(buildPath_ + "/Contents/MacOS/AtomicPlayer");
-    fileSystem->SystemRun("chmod", args);
-#endif
-
-    buildPath_ = buildPath + "/Mac-Build";
-    buildSystem->BuildComplete(PLATFORMID_MAC, buildPath_);
-
-}
-*/
-
 }
 }