incremetnal
diff --git a/static/CMakeLists.txt b/static/CMakeLists.txt
index 58bfdbb..b7371d1 100644
--- a/static/CMakeLists.txt
+++ b/static/CMakeLists.txt
@@ -1,15 +1,3 @@
-set(HTML_ASSETS
- hello.html
- login.html
- partial-eventlog.html
- partial-fruinfo.html
- partial-home-list.html
- partial-kvm.html
- partial-systeminfo.html
- websocket.html
-)
-
-
set(JAVASCRIPT_ASSETS
js/selController.js
js/lodash.core.js
@@ -19,6 +7,7 @@
js/angular-ui-router.js
js/restangular.js
js/kvm-controller.js
+ js/logincontroller.js
js/angular-resource.js
js/angular-sanitize.js
js/bmcApp.js
@@ -54,29 +43,65 @@
css/font-awesome.css
css/bootstrap-theme.css
css/prettify.css
- noVNC/tests/viewport.css
noVNC/include/base.css
noVNC/include/blue.css
noVNC/include/black.css
)
+set(HTML_ASSETS
+ index.html
+ login.html
+ partial-eventlog.html
+ partial-fruinfo.html
+ partial-home-list.html
+ partial-kvm.html
+ partial-systeminfo.html
+ websocket.html
+)
+
+set(IMG_ASSETS
+ img/logo.png
+)
+
set(STATIC_ASSETS_OUT "")
foreach(JAVASCRIPT_ASSET ${JAVASCRIPT_ASSETS})
- set(OUTPUT_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/${JAVASCRIPT_ASSET})
- get_filename_component(FOLDERNAME ${OUTPUT_FILENAME} DIRECTORY)
- file(MAKE_DIRECTORY "${FOLDERNAME}")
- # TODO only minify if not a debug build
- add_custom_command(OUTPUT ${OUTPUT_FILENAME}
- COMMAND closure-compiler --language_in=ECMASCRIPT5
- --js "${CMAKE_CURRENT_SOURCE_DIR}/${JAVASCRIPT_ASSET}"
- --js_output_file "${CMAKE_CURRENT_BINARY_DIR}/${JAVASCRIPT_ASSET}"
+ # if it's a debug build, don't minify
+ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ list(APPEND STATIC_ASSETS_OUT ${CMAKE_CURRENT_SOURCE_DIR}/${JAVASCRIPT_ASSET})
+ else()
+ set(OUTPUT_FILENAME ${CMAKE_CURRENT_BINARY_DIR}/${JAVASCRIPT_ASSET})
+ get_filename_component(FOLDERNAME ${OUTPUT_FILENAME} DIRECTORY)
+ file(MAKE_DIRECTORY "${FOLDERNAME}")
+ # TODO only minify if not a debug build
+ add_custom_command(OUTPUT ${OUTPUT_FILENAME}
+ COMMAND closure-compiler --language_in=ECMASCRIPT5
+ --js "${CMAKE_CURRENT_SOURCE_DIR}/${JAVASCRIPT_ASSET}"
+ --js_output_file "${CMAKE_CURRENT_BINARY_DIR}/${JAVASCRIPT_ASSET}"
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${JAVASCRIPT_ASSET}"
- COMMENT "Minifying ${JAVASCRIPT_ASSET}"
- )
- list(APPEND STATIC_ASSETS_OUT ${CMAKE_CURRENT_BINARY_DIR}/${JAVASCRIPT_ASSET})
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${JAVASCRIPT_ASSET}"
+ COMMENT "Minifying ${JAVASCRIPT_ASSET}"
+ )
+ list(APPEND STATIC_ASSETS_OUT ${CMAKE_CURRENT_BINARY_DIR}/${JAVASCRIPT_ASSET})
+ endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
endforeach(JAVASCRIPT_ASSET)
+# for now CSS is included as is
+foreach(CSS_ASSET ${CSS_ASSETS})
+ list(APPEND STATIC_ASSETS_OUT ${CMAKE_CURRENT_SOURCE_DIR}/${CSS_ASSET})
+endforeach(CSS_ASSET)
+
+# for now HTML is included as is
+foreach(HTML_ASSET ${HTML_ASSETS})
+ list(APPEND STATIC_ASSETS_OUT ${CMAKE_CURRENT_SOURCE_DIR}/${HTML_ASSET})
+endforeach(HTML_ASSET)
+
+# for now IMG is included as is
+foreach(IMG_ASSET ${IMG_ASSETS})
+ list(APPEND STATIC_ASSETS_OUT ${CMAKE_CURRENT_SOURCE_DIR}/${IMG_ASSET})
+endforeach(IMG_ASSET)
+
+message(STATIC_ASSETS_OUT ${CMAKE_CURRENT_BINARY_DIR}/${STATIC_ASSETS_OUT})
+
add_custom_target(minifyjs ALL DEPENDS ${STATIC_ASSETS_OUT})
set(CXX_STATIC_ASSETS_OUTPUT_FILE ${CMAKE_BINARY_DIR}/generated/webassets.cpp)