Working on build improvements

Build/Scripts/BuildAndroid.js

@@ -7,7 +7,7 @@ var playerBuildDir = buildDir + "AtomicPlayer/";
 
 namespace('build', function() {
 
-  task('android_player', ["build:atomictool"], {
+  task('android_player', {
     async: true
   }, function() {
 

Build/Scripts/BuildIOS.js

@@ -6,7 +6,7 @@ var buildDir = bcommon.artifactsRoot + "Build/IOS/";
 
 namespace('build', function() {
 
-  task('ios_player', ["build:atomictool"], {
+  task('ios_player', {
     async: true
   }, function() {
 

Build/Scripts/BuildMac.js

@@ -6,7 +6,7 @@ var buildDir = bcommon.artifactsRoot + "Build/Mac/";
 
 namespace('build', function() {
 
-  task('mac_player', ["build:atomictool"], {
+  task('mac_player', {
     async: true
   }, function() {
 

Build/Scripts/BuildWeb.js

@@ -6,7 +6,7 @@ var buildDir = bcommon.artifactsRoot + "Build/Web/";
 
 namespace('build', function() {
 
-  task('web_player', ["build:atomictool"], {
+  task('web_player', {
     async: true
   }, function() {
 

Source/AtomicEditor/CMakeLists.txt

@@ -7,19 +7,6 @@ include_directories ( ${CMAKE_SOURCE_DIR}/Source/ThirdParty
 
 file (GLOB_RECURSE SOURCE_FILES *.cpp *.h)
 
-# Create the JSBind files ahead of time, so they are picked up with glob
-set (JSFILES JSPackageEditor.cpp;JSModuleEditor.cpp)
-
-foreach(JSFILE ${JSFILES})
-
-  set (JSFILEPATH "${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Packages/Editor/${JSFILE}")
-
-  if (NOT EXISTS ${JSFILEPATH})
-    file(WRITE "${JSFILEPATH}" "// will be created by JSBind")
-  endif()
-
-endforeach()
-
 file (GLOB JAVASCRIPT_BINDINGS_SOURCE ${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Packages/Editor/*.cpp)
 
 set (SOURCE_FILES ${SOURCE_FILES} ${JAVASCRIPT_BINDINGS_SOURCE})
@@ -107,8 +94,6 @@ if (TARGET_PROPERTIES)
     set_target_properties (AtomicEditor PROPERTIES ${TARGET_PROPERTIES})
 endif ()
 
-add_dependencies(AtomicEditor AtomicTool)
-
 GroupSources("Application")
 GroupSources("EditorMode")
 GroupSources("Editors")

Source/AtomicJS/CMakeLists.txt

@@ -15,34 +15,12 @@ if (NOT MSVC)
     add_definitions (-DUNIX)
 endif()
 
-# Create the JSBind files ahead of time, so they are picked up with glob
-set (JSFILES JSModuleAtomic2D.cpp;JSModuleAtomic3D.cpp;JSModuleAudio.cpp;JSModuleContainer.cpp;JSModuleCore.cpp;
-             JSModuleEngine.cpp;JSModuleEnvironment.cpp;JSModuleGraphics.cpp;JSModuleInput.cpp;
-             JSModuleIO.cpp;JSModuleJavascript.cpp;JSModuleMath.cpp;JSModuleNavigation.cpp;
-             JSModuleNetwork.cpp;JSModulePhysics.cpp;JSModuleResource.cpp;JSPackageAtomic.cpp;
-             JSModuleScene.cpp;JSModuleUI.cpp;JSModuleWeb.cpp;JSModuleScript.cpp)
-
-foreach(JSFILE ${JSFILES})
-
-  set (JSFILEPATH "${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Packages/Atomic/${JSFILE}")
-
-  if (NOT EXISTS ${JSFILEPATH})
-    file(WRITE "${JSFILEPATH}" "// will be created by JSBind")
-  endif()
-
-endforeach()
-
-
 file (GLOB JAVASCRIPT_BINDINGS_SOURCE ${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Packages/Atomic/*.cpp)
 
 set (SOURCE_FILES ${JAVASCRIPT_SOURCE} ${JAVASCRIPT_BINDINGS_SOURCE})
 
 add_library(AtomicJS ${SOURCE_FILES})
 
-if (NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN)
-    add_dependencies(AtomicJS AtomicTool)
-endif()
-
 add_custom_command (TARGET AtomicJS POST_BUILD
 COMMAND ${CMAKE_COMMAND}
 ARGS -E copy_if_different \"${CMAKE_SOURCE_DIR}/Script/JSPlugin/AtomicPlugin.h\" \"${CMAKE_SOURCE_DIR}/Bin/NativePluginSDK/AtomicPlugin.h\")

Source/AtomicPlayerJS/CMakeLists.txt

@@ -2,19 +2,6 @@ include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty)
 
 file (GLOB_RECURSE SOURCE_FILES *.cpp *.h)
 
-# Create the JSBind files ahead of time, so they are picked up with glob
-set (JSFILES JSPackageAtomicPlayer.cpp;JSModulePlayer.cpp)
-
-foreach(JSFILE ${JSFILES})
-
-  set (JSFILEPATH "${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Packages/AtomicPlayer/${JSFILE}")
-
-  if (NOT EXISTS ${JSFILEPATH})
-    file(WRITE "${JSFILEPATH}" "// will be created by JSBind")
-  endif()
-
-endforeach()
-
 file (GLOB JAVASCRIPT_BINDINGS_SOURCE ${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Packages/AtomicPlayer/*.cpp)
 
 set (SOURCE_FILES ${SOURCE_FILES} ${JAVASCRIPT_BINDINGS_SOURCE} )
@@ -22,5 +9,3 @@ set (SOURCE_FILES ${SOURCE_FILES} ${JAVASCRIPT_BINDINGS_SOURCE} )
 add_library(AtomicPlayerJS ${SOURCE_FILES})
 
 target_link_libraries(AtomicPlayerJS AtomicPlayerLib)
-
-add_dependencies(AtomicPlayerJS AtomicTool)

Source/AtomicTool/CMakeLists.txt

@@ -23,20 +23,6 @@ else()
     target_link_libraries(AtomicTool curl)
 endif()
 
-
-if (NOT ATOMICTOOL_NOGEN)
-
-add_custom_command(TARGET AtomicTool POST_BUILD
-                   COMMAND $<TARGET_FILE:AtomicTool> bind "\"${CMAKE_SOURCE_DIR}\"" "Script/Packages/Atomic/" "${JAVASCRIPT_BINDINGS_PLATFORM}"
-                   COMMAND $<TARGET_FILE:AtomicTool> bind "\"${CMAKE_SOURCE_DIR}\"" "Script/Packages/AtomicPlayer/" "${JAVASCRIPT_BINDINGS_PLATFORM}"
-                   COMMAND $<TARGET_FILE:AtomicTool> bind "\"${CMAKE_SOURCE_DIR}\"" "Script/Packages/ToolCore/" "${JAVASCRIPT_BINDINGS_PLATFORM}"
-                   COMMAND $<TARGET_FILE:AtomicTool> bind "\"${CMAKE_SOURCE_DIR}\"" "Script/Packages/Editor/" "${JAVASCRIPT_BINDINGS_PLATFORM}"
-                   COMMAND $<TARGET_FILE:AtomicTool> bind "\"${CMAKE_SOURCE_DIR}\"" "Script/Packages/AtomicNET/" "${JAVASCRIPT_BINDINGS_PLATFORM}"
-                   COMMENT "Generating Script Bindings")
-
-endif(ATOMICTOOL_NOGEN)                   
-
-
 if (ATOMIC_DOTNET_DEV)
 
 if (NOT EXISTS ${CMAKE_SOURCE_DIR}/Artifacts/AtomicNET/TPA)

Source/ToolCoreJS/CMakeLists.txt

@@ -2,19 +2,6 @@ include_directories (${CMAKE_SOURCE_DIR}/Source/ThirdParty ${CMAKE_SOURCE_DIR}/S
 
 file (GLOB_RECURSE SOURCE_FILES *.cpp *.h)
 
-# Create the JSBind files ahead of time, so they are picked up with glob
-set (JSFILES JSPackageToolCore.cpp;JSModuleToolCore.cpp)
-
-foreach(JSFILE ${JSFILES})
-
-  set (JSFILEPATH "${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Packages/ToolCore/${JSFILE}")
-
-  if (NOT EXISTS ${JSFILEPATH})
-    file(WRITE "${JSFILEPATH}" "// will be created by JSBind")
-  endif()
-
-endforeach()
-
 file (GLOB JAVASCRIPT_BINDINGS_SOURCE ${CMAKE_SOURCE_DIR}/Build/Source/Generated/${JAVASCRIPT_BINDINGS_PLATFORM}/Javascript/Packages/ToolCore/*.cpp)
 
 set (SOURCE_FILES ${SOURCE_FILES} ${JAVASCRIPT_BINDINGS_SOURCE} )