From c40e8482206650666df0582e1af77cc38a5fa4b3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 13 Sep 2013 11:21:03 -0700 Subject: [PATCH] move DS web to resources for deploys --- domain-server/CMakeLists.txt | 6 +++--- .../{src => resources}/web/assignment/css/style.css | 0 domain-server/{src => resources}/web/assignment/index.shtml | 0 .../{src => resources}/web/assignment/js/ace/ace.js | 0 .../web/assignment/js/ace/mode-javascript.js | 0 .../web/assignment/js/ace/snippets/javascript.js | 0 .../web/assignment/js/ace/theme-twilight.js | 0 .../web/assignment/js/ace/worker-javascript.js | 0 .../{src => resources}/web/assignment/js/assignment.js | 0 .../{src => resources}/web/assignment/placeholder.js | 0 domain-server/{src => resources}/web/index.html | 0 domain-server/src/main.cpp | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) rename domain-server/{src => resources}/web/assignment/css/style.css (100%) rename domain-server/{src => resources}/web/assignment/index.shtml (100%) rename domain-server/{src => resources}/web/assignment/js/ace/ace.js (100%) rename domain-server/{src => resources}/web/assignment/js/ace/mode-javascript.js (100%) rename domain-server/{src => resources}/web/assignment/js/ace/snippets/javascript.js (100%) rename domain-server/{src => resources}/web/assignment/js/ace/theme-twilight.js (100%) rename domain-server/{src => resources}/web/assignment/js/ace/worker-javascript.js (100%) rename domain-server/{src => resources}/web/assignment/js/assignment.js (100%) rename domain-server/{src => resources}/web/assignment/placeholder.js (100%) rename domain-server/{src => resources}/web/index.html (100%) diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index de606d3752..55558fa7de 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -11,11 +11,11 @@ setup_hifi_project(${TARGET_NAME} TRUE) # remove and then copy the files for the webserver add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E remove_directory - $/web) + $/resources/web) add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory - "${PROJECT_SOURCE_DIR}/src/web" - $/web) + "${PROJECT_SOURCE_DIR}/resources/web" + $/resources/web) # link the shared hifi library include(${MACRO_DIR}/LinkHifiLibrary.cmake) diff --git a/domain-server/src/web/assignment/css/style.css b/domain-server/resources/web/assignment/css/style.css similarity index 100% rename from domain-server/src/web/assignment/css/style.css rename to domain-server/resources/web/assignment/css/style.css diff --git a/domain-server/src/web/assignment/index.shtml b/domain-server/resources/web/assignment/index.shtml similarity index 100% rename from domain-server/src/web/assignment/index.shtml rename to domain-server/resources/web/assignment/index.shtml diff --git a/domain-server/src/web/assignment/js/ace/ace.js b/domain-server/resources/web/assignment/js/ace/ace.js similarity index 100% rename from domain-server/src/web/assignment/js/ace/ace.js rename to domain-server/resources/web/assignment/js/ace/ace.js diff --git a/domain-server/src/web/assignment/js/ace/mode-javascript.js b/domain-server/resources/web/assignment/js/ace/mode-javascript.js similarity index 100% rename from domain-server/src/web/assignment/js/ace/mode-javascript.js rename to domain-server/resources/web/assignment/js/ace/mode-javascript.js diff --git a/domain-server/src/web/assignment/js/ace/snippets/javascript.js b/domain-server/resources/web/assignment/js/ace/snippets/javascript.js similarity index 100% rename from domain-server/src/web/assignment/js/ace/snippets/javascript.js rename to domain-server/resources/web/assignment/js/ace/snippets/javascript.js diff --git a/domain-server/src/web/assignment/js/ace/theme-twilight.js b/domain-server/resources/web/assignment/js/ace/theme-twilight.js similarity index 100% rename from domain-server/src/web/assignment/js/ace/theme-twilight.js rename to domain-server/resources/web/assignment/js/ace/theme-twilight.js diff --git a/domain-server/src/web/assignment/js/ace/worker-javascript.js b/domain-server/resources/web/assignment/js/ace/worker-javascript.js similarity index 100% rename from domain-server/src/web/assignment/js/ace/worker-javascript.js rename to domain-server/resources/web/assignment/js/ace/worker-javascript.js diff --git a/domain-server/src/web/assignment/js/assignment.js b/domain-server/resources/web/assignment/js/assignment.js similarity index 100% rename from domain-server/src/web/assignment/js/assignment.js rename to domain-server/resources/web/assignment/js/assignment.js diff --git a/domain-server/src/web/assignment/placeholder.js b/domain-server/resources/web/assignment/placeholder.js similarity index 100% rename from domain-server/src/web/assignment/placeholder.js rename to domain-server/resources/web/assignment/placeholder.js diff --git a/domain-server/src/web/index.html b/domain-server/resources/web/index.html similarity index 100% rename from domain-server/src/web/index.html rename to domain-server/resources/web/index.html diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 47dfa83aef..54fe994c84 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -155,7 +155,7 @@ int main(int argc, const char* argv[]) { // list of options. Last element must be NULL. const char *options[] = {"listening_ports", "8080", - "document_root", "./web", NULL}; + "document_root", "./resources/web", NULL}; callbacks.begin_request = mongooseRequestHandler; callbacks.upload = mongooseUploadHandler;