Peter M. Groen / dali-demo

Commit ee7476145f3a700e9330bebb07342429dd9e53ba

Authored by Tom Robinson
1 parent 44b8e4da

Dali-demo install script and README for Emscripten examples 

Change-Id: I15c5a25925ed9c8fdd60f8b0fa322fbeaf02c94a
Inline Side-by-side
Showing 3 changed files with 23 additions and 11 deletions
... ... @@ -8,6 +8,7 @@ T.O.C.
8 8 2.1. Minimum Requirements
9 9 2.2. Building the Repository
10 10 3. Creating an example
  11 + 4. Installing Emscripten examples
11 12  
12 13  
13 14 1. GBS Builds
... ... @@ -57,3 +58,16 @@ Then run the following commands:
57 58 - Modify "com.samsung.dali-demo.xml" to include your example so that it can be launched on target.
58 59 - No changes are required to the make system as long as the above is followed, your example will be automatically built & installed.
59 60  
  61 +
  62 +4. Installing Emscripten Examples
  63 +=================================
  64 +
  65 +Some Emscripten Javascript examples are included in dali-demo.
  66 +
  67 +They do not require building, to install them run the provided install script.
  68 +Note: Your dali-env must be setup as it will install to your dali-env/opt/share/emscripten directory.
  69 +
  70 +# cd ./emscripten-examples
  71 +# ./install.sh
  72 +
  73 +Run the examples by either opening them in a browser, or, running the browser from the command line with an example as a parameter.
... ...
build/tizen/CMakeLists.txt
  View file @ee74761
... ... @@ -14,10 +14,6 @@ IF(DEFINED DALI_APP_DIR)
14 14 ELSE()
15 15 SET(APP_DATA_DIR ${PREFIX}/share/com.samsung.dali-demo)
16 16 SET(BINDIR ${PREFIX}/bin)
17   -
18   - # Directory for compiled Emscripten artifacts along with Emscripten examples and demos.
19   - SET(EMSCRIPTEN_ENV_DIR ${APP_DATA_DIR}/../emscripten/)
20   - SET(EMSCRIPTEN_EXAMPLE_DIR ${ROOT_SRC_DIR}/emscripten-examples/)
21 17 ENDIF()
22 18  
23 19  
... ... @@ -98,10 +94,3 @@ INCLUDE_DIRECTORIES(${DEMO_SRC_DIR})
98 94 ADD_SUBDIRECTORY(demo)
99 95 ADD_SUBDIRECTORY(examples)
100 96 ADD_SUBDIRECTORY(builder)
101   -
102   -IF(NOT DEFINED DALI_APP_DIR)
103   - FILE( MAKE_DIRECTORY ${EMSCRIPTEN_ENV_DIR} )
104   - CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.js ${EMSCRIPTEN_ENV_DIR}/ )
105   - CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-toy.html ${EMSCRIPTEN_ENV_DIR}/ )
106   - CONFIGURE_FILE( ${EMSCRIPTEN_EXAMPLE_DIR}/dali-doc-demo.html ${EMSCRIPTEN_ENV_DIR}/ )
107   -ENDIF()
... ...
emscripten-examples/install.sh 0 → 100755
  View file @ee74761
  1 +#!/bin/bash
  2 +
  3 +INSTALL_PATH=$DESKTOP_PREFIX/share/emscripten/
  4 +
  5 +echo "Installing Emscripten examples to: $INSTALL_PATH"
  6 +
  7 +mkdir -p $INSTALL_PATH
  8 +cp -v *.{js,html} $INSTALL_PATH/
  9 +
... ...