Browse Source

Updates for Windows

Josh Engebretson 10 years ago
parent
commit
61486079be

+ 1 - 0
CLI/atomic-cli-windows-data/.gitignore

@@ -1,2 +1,3 @@
 node_modules/*
 data/editor/*
+*.tgz

+ 1 - 1
CLI/atomic-cli-windows-data/package.json

@@ -7,7 +7,7 @@
   "files" : ["data"],
   "main": "./data/index.js",
   "name": "atomic-cli-windows-data",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "os" : ["win32"]
 
 }

+ 2 - 2
CLI/atomic-cli-windows/package.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/AtomicGameEngine/AtomicGameEngine/issues"
   },
   "dependencies": {
-    "atomic-cli-windows-data" : "http://docs.atomicgameengine.com/npm/atomic-cli-windows-data-0.0.1.tgz"
+    "atomic-cli-windows-data" : "http://docs.atomicgameengine.com/npm/atomic-cli-windows-data-0.0.2.tgz"
   },
   "description": "Windows dependencies for atomic-cli package",
   "engines": {
@@ -24,5 +24,5 @@
   "preferGlobal": true,
   "repository": "https://github.com/AtomicGameEngine/AtomicGameEngine",
   "os" : ["win32"],
-  "version": "0.0.4"
+  "version": "0.0.5"
 }

+ 5 - 2
Rakefile

@@ -360,7 +360,6 @@ namespace :package do
 
     # Resources
     COREDATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicPlayer/Resources/CoreData"
-    EDITORRESOURCES_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicEditor/Resources/EditorData"
     EDITORAPPLICATIONDATA_FOLDER_SRC = "#{$RAKE_ROOT}/Data/AtomicEditor"
 
     # Project Templates
@@ -370,8 +369,11 @@ namespace :package do
     #Example info could possibly go in the AtomicExamples repo
     EXAMPLEINFO_FOLDER_SRC = "#{EDITORAPPLICATIONDATA_FOLDER_SRC}/ExampleInfo"
 
+    # This shouldn't ne in root, used for deployment atm, however the editor can use coredata from pak
     FileUtils.cp_r("#{COREDATA_FOLDER_SRC}", "#{EDITOR_APP_FOLDER_DST}/CoreData")
-    FileUtils.cp_r("#{EDITORRESOURCES_FOLDER_SRC}", "#{EDITOR_APP_FOLDER_DST}/EditorData")
+
+    FileUtils.cp("#{CMAKE_WINDOWS_BUILD_FOLDER}/Source/AtomicEditor/EditorData.pak", "#{EDITOR_APP_FOLDER_DST}/EditorData.pak")
+    FileUtils.cp("#{CMAKE_WINDOWS_BUILD_FOLDER}/Source/AtomicEditor/CoreData.pak", "#{EDITOR_APP_FOLDER_DST}/CoreData.pak")
 
     FileUtils.cp_r("#{PROJECTTEMPLATES_FOLDER_SRC}", "#{EDITOR_APP_FOLDER_DST}/ProjectTemplates")
     FileUtils.cp_r("#{EXAMPLEINFO_FOLDER_SRC}", "#{EDITOR_APP_FOLDER_DST}/ExampleInfo")
@@ -507,6 +509,7 @@ namespace :windows do
     Dir.chdir(CMAKE_WINDOWS_BUILD_FOLDER) do
 
       sh "jom -j4 AtomicEditor"
+      sh "jom BuildEditorFiles"
 
     end