From bb0c21b8eaef06f935cbd89b26a2d5cdf37982ef Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Thu, 1 Nov 2018 16:29:50 -0700 Subject: [PATCH] Rename filamentjs to filament-js to follow convention. --- CMakeLists.txt | 2 +- build.sh | 10 +++++----- build/web/ci-common.sh | 2 +- web/docs/build.py | 14 +++++++------- web/{filamentjs => filament-js}/CMakeLists.txt | 8 ++++---- web/{filamentjs => filament-js}/extensions.js | 0 web/{filamentjs => filament-js}/jsbindings.cpp | 4 ++-- web/{filamentjs => filament-js}/jsenums.cpp | 0 web/{filamentjs => filament-js}/utilities.js | 0 web/{filamentjs => filament-js}/wasmloader.js | 0 web/samples/CMakeLists.txt | 8 ++++---- 11 files changed, 24 insertions(+), 24 deletions(-) rename web/{filamentjs => filament-js}/CMakeLists.txt (84%) rename web/{filamentjs => filament-js}/extensions.js (100%) rename web/{filamentjs => filament-js}/jsbindings.cpp (99%) rename web/{filamentjs => filament-js}/jsenums.cpp (100%) rename web/{filamentjs => filament-js}/utilities.js (100%) rename web/{filamentjs => filament-js}/wasmloader.js (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 370acb58e5..4166f5f89b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -290,7 +290,7 @@ endif() set (FILAMENT_SAMPLES_BINARY_DIR ${PROJECT_BINARY_DIR}/samples) if (WEBGL) - add_subdirectory(web/filamentjs) + add_subdirectory(web/filament-js) add_subdirectory(web/samples) add_subdirectory(${LIBRARIES}/filagui) diff --git a/build.sh b/build.sh index 82c07f2d08..215f7cee4e 100755 --- a/build.sh +++ b/build.sh @@ -219,7 +219,7 @@ function build_webgl_with_target { ${BUILD_COMMAND} ${BUILD_TARGETS} fi - if [ -d "web/filamentjs" ]; then + if [ -d "web/filament-js" ]; then if [ "$ISSUE_ARCHIVES" == "true" ]; then which -s python3 @@ -237,10 +237,10 @@ function build_webgl_with_target { # dist...core WASM module and accompanying JS file. # docs...HTML tutorials for the JS API, accompanying demos, and a reference page. cd web - tar -cvf ../../filament-${LC_TARGET}-web.tar -s /^filamentjs/dist/ \ - filamentjs/filament.js - tar -rvf ../../filament-${LC_TARGET}-web.tar -s /^filamentjs/dist/ \ - filamentjs/filament.wasm + tar -cvf ../../filament-${LC_TARGET}-web.tar -s /^filament-js/dist/ \ + filament-js/filament.js + tar -rvf ../../filament-${LC_TARGET}-web.tar -s /^filament-js/dist/ \ + filament-js/filament.wasm tar -rvf ../../filament-${LC_TARGET}-web.tar docs cd - gzip -c ../filament-${LC_TARGET}-web.tar > ../filament-${LC_TARGET}-web.tgz diff --git a/build/web/ci-common.sh b/build/web/ci-common.sh index 43d3263a84..f12bf42d9f 100755 --- a/build/web/ci-common.sh +++ b/build/web/ci-common.sh @@ -6,7 +6,7 @@ chmod +x ninja export PATH="$PWD:$PATH" # The Kokoro machines have Python 3.6.3 installed. Let's verify that here, and install the -# distributions required for libs/filamentjs/docs. +# distributions required for web/docs. python3 --version pip3 install mistletoe pygments jsbeautifier diff --git a/web/docs/build.py b/web/docs/build.py index 5834849b19..2dc2d3b552 100755 --- a/web/docs/build.py +++ b/web/docs/build.py @@ -442,11 +442,11 @@ def build_reference_markdown(doctree): def build_reference(): doctree = gather_docstrings([ - ROOT_DIR + 'web/filamentjs/jsbindings.cpp', - ROOT_DIR + 'web/filamentjs/jsenums.cpp', - ROOT_DIR + 'web/filamentjs/utilities.js', - ROOT_DIR + 'web/filamentjs/wasmloader.js', - ROOT_DIR + 'web/filamentjs/extensions.js', + ROOT_DIR + 'web/filament-js/jsbindings.cpp', + ROOT_DIR + 'web/filament-js/jsenums.cpp', + ROOT_DIR + 'web/filament-js/utilities.js', + ROOT_DIR + 'web/filament-js/wasmloader.js', + ROOT_DIR + 'web/filament-js/extensions.js', ]) markdown = build_reference_markdown(doctree) rendered = mistletoe.markdown(markdown, PygmentsRenderer) @@ -489,8 +489,8 @@ if __name__ == "__main__": copy_src_file(ROOT_DIR + 'web/docs/main.css') copy_src_file(ROOT_DIR + 'third_party/gl-matrix/gl-matrix-min.js') - copy_built_file('web/filamentjs/filament.js') - copy_built_file('web/filamentjs/filament.wasm') + copy_built_file('web/filament-js/filament.js') + copy_built_file('web/filament-js/filament.wasm') copy_built_file('web/samples/pillars_2k/pillars_2k_skybox.ktx') copy_built_file('web/samples/pillars_2k/pillars_2k_ibl.ktx') build_filamat('triangle') diff --git a/web/filamentjs/CMakeLists.txt b/web/filament-js/CMakeLists.txt similarity index 84% rename from web/filamentjs/CMakeLists.txt rename to web/filament-js/CMakeLists.txt index ffccb1a81f..8ed5a5c8b4 100644 --- a/web/filamentjs/CMakeLists.txt +++ b/web/filament-js/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1) -project(filamentjs) +project(filament-js) set(JAVASCRIPT_SRC ${CMAKE_CURRENT_SOURCE_DIR}/wasmloader.js @@ -31,10 +31,10 @@ endforeach() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LOPTS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COPTS}") -add_executable(filamentjs ${CPP_SRC}) +add_executable(filament-js ${CPP_SRC}) -set_target_properties(filamentjs PROPERTIES +set_target_properties(filament-js PROPERTIES LINK_DEPENDS "${JAVASCRIPT_SRC}" OUTPUT_NAME filament) -target_link_libraries(filamentjs PRIVATE filament math utils image filameshio stb) +target_link_libraries(filament-js PRIVATE filament math utils image filameshio stb) diff --git a/web/filamentjs/extensions.js b/web/filament-js/extensions.js similarity index 100% rename from web/filamentjs/extensions.js rename to web/filament-js/extensions.js diff --git a/web/filamentjs/jsbindings.cpp b/web/filament-js/jsbindings.cpp similarity index 99% rename from web/filamentjs/jsbindings.cpp rename to web/filament-js/jsbindings.cpp index 9e84af173c..2a2feebcaf 100644 --- a/web/filamentjs/jsbindings.cpp +++ b/web/filament-js/jsbindings.cpp @@ -18,8 +18,8 @@ * JS BINDINGS DESIGN * ------------------ * - * The purpose of the filamentjs library is to offer a first-class JavaScript interface to the core - * Filament classes: Engine, Renderer, Texture, etc. + * The purpose of filament-js is to offer a first-class JavaScript interface to the core Filament + * classes: Engine, Renderer, Texture, etc. * * Emscripten offers two ways to binding JavaScript to C++: embind and WebIDL. We chose embind. * diff --git a/web/filamentjs/jsenums.cpp b/web/filament-js/jsenums.cpp similarity index 100% rename from web/filamentjs/jsenums.cpp rename to web/filament-js/jsenums.cpp diff --git a/web/filamentjs/utilities.js b/web/filament-js/utilities.js similarity index 100% rename from web/filamentjs/utilities.js rename to web/filament-js/utilities.js diff --git a/web/filamentjs/wasmloader.js b/web/filament-js/wasmloader.js similarity index 100% rename from web/filamentjs/wasmloader.js rename to web/filament-js/wasmloader.js diff --git a/web/samples/CMakeLists.txt b/web/samples/CMakeLists.txt index 3bc72117ac..bd08da41a6 100644 --- a/web/samples/CMakeLists.txt +++ b/web/samples/CMakeLists.txt @@ -142,13 +142,13 @@ add_custom_target(sample_assets DEPENDS add_custom_command( OUTPUT ${SERVER_DIR}/filament.js - DEPENDS filamentjs - COMMAND cmake -E copy ${PROJECT_BINARY_DIR}/../filamentjs/filament.js ${SERVER_DIR}) + DEPENDS filament-js + COMMAND cmake -E copy ${PROJECT_BINARY_DIR}/../filament-js/filament.js ${SERVER_DIR}) add_custom_command( OUTPUT ${SERVER_DIR}/filament.wasm - DEPENDS filamentjs - COMMAND cmake -E copy ${PROJECT_BINARY_DIR}/../filamentjs/filament.wasm ${SERVER_DIR}) + DEPENDS filament-js + COMMAND cmake -E copy ${PROJECT_BINARY_DIR}/../filament-js/filament.wasm ${SERVER_DIR}) add_custom_target(filamentjs_public DEPENDS ${SERVER_DIR}/filament.js ${SERVER_DIR}/filament.wasm)