Submodules updated

.gitmodules

@@ -22,3 +22,18 @@
 [submodule "cairo-chart"]
 	path = cairo-chart
 	url = git@git.backbone.ws:kolan/Cairo-Chart.git
+[submodule "table_meas"]
+	path = table_meas
+	url = git@git.insysltd.org:kolan/LAview.Object.TableMeas.git
+[submodule "control_point"]
+	path = control_point
+	url = git@git.insysltd.org:kolan/LAview.Data.ControlPoint.git
+[submodule "stand_config"]
+	path = stand_config
+	url = git@git.insysltd.org:kolan/LAview.Data.StandConfig.git
+[submodule "laview-templates"]
+	path = laview-templates
+	url = git@git.insysltd.org:kolan/LAview.Templates.git
+[submodule "config-xml"]
+	path = config-xml
+	url = git@git.insysltd.org:InSysLtd/config-xml.git

CMakeLists.txt

@@ -70,8 +70,29 @@ ExternalProject_Add (cairo-chart
                      INSTALL_DIR bundle
 )
 
+ExternalProject_Add (table_meas
+                     SOURCE_DIR ${CMAKE_SOURCE_DIR}/table_meas
+                     #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle
+                     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle
+#                     PREFIX table_meas
+                     INSTALL_DIR bundle
+)
 
+ExternalProject_Add (control_point
+                     SOURCE_DIR ${CMAKE_SOURCE_DIR}/control_point
+                     #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle
+                     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle
+#                     PREFIX control_point
+                     INSTALL_DIR bundle
+)
 
+ExternalProject_Add (stand_config
+                     SOURCE_DIR ${CMAKE_SOURCE_DIR}/stand_config
+                     #CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=bundle
+                     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/bundle
+#                     PREFIX stand_config
+                     INSTALL_DIR bundle
+)
 
 
 

build32.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+for d in cairo-chart gobject-plugin latex-struct core data-example object-example stand_config control_point desktop table_meas; do cd $d && mkdir -p build-mingw32 && cd build-mingw32 && rm -rf * && cmake -G "MSYS Makefiles" .. -DCMAKE_BUILD_TYPE=Release && make && cpack && ./*.exe && cd ../.. || break; done

build64.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+for d in cairo-chart gobject-plugin latex-struct core data-example object-example stand_config control_point desktop table_meas; do cd $d && mkdir -p build-mingw64 && cd build-mingw64 && rm -rf * && cmake -G "MSYS Makefiles" .. -DCMAKE_BUILD_TYPE=Release && make && cpack && ./*.exe && cd ../.. || break; done

cairo-chart

@@ -1 +1 @@
-Subproject commit a9d77c1109221457ac0d0d168263a7516402f854
+Subproject commit 7748a11de4823d36236f3456144434c63f3285a0

config-xml

@@ -0,0 +1 @@
+Subproject commit b11e6e775bbdfecb8ed23df7bd75eb25973d1a7c

control_point

@@ -0,0 +1 @@
+Subproject commit f40ed06c9aec2b58f45d45a6bb4e2cdf0cdcd63a

core

@@ -1 +1 @@
-Subproject commit 0895e89413b114fd945d06f7b2f5a9b4d8cc5446
+Subproject commit 3e214e8234d6cc80dd73a06b7bf7004683b3767d

cpack/CMakeLists.txt

@@ -19,15 +19,15 @@ SET (CPACK_CREATE_DESKTOP_LINKS "..\\\\win${ARCH}\\\\bundle\\\\bin\\\\laview-des
 FILE (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bundle/bin)
 FOREACH (binname gspawn-win${ARCH}-helper.exe perl.exe perl522.dll
          libatk-1.0-0.dll libbz2-1.dll libcairo-2.dll libcairo-gobject-2.dll
-         libcroco-0.6-3.dll libepoxy-0.dll
-         libexpat-1.dll libffi-6.dll libfontconfig-1.dll libfreetype-6.dll
+         libcroco-0.6-3.dll libdatrie-1.dll libepoxy-0.dll
+         libexpat-1.dll libffi-6.dll libfontconfig-1.dll libfreetype-6.dll libfribidi-0.dll
          libgcc_s_seh-1.dll libgcc_s_dw2-1.dll
          libgdk_pixbuf-2.0-0.dll libgdk-3-0.dll libgee-0.8-2.dll libgio-2.0-0.dll libglib-2.0-0.dll
-         libgmodule-2.0-0.dll libgobject-2.0-0.dll libgraphite2.dll libgtk-3-0.dll libharfbuzz-0.dll
+         libgmodule-2.0-0.dll libgobject-2.0-0.dll libgraphite2.dll libgtk-3-0.dll libgxml-0.16-1.0.0.dll libharfbuzz-0.dll
          libiconv-2.dll libintl-8.dll liblzma-5.dll libpango-1.0-0.dll libpangocairo-1.0-0.dll libpangoft2-1.0-0.dll
          libpangowin32-1.0-0.dll libpcre-1.dll libpixman-1-0.dll
-         libpng16-16.dll librsvg-2-2.dll libstdc++-6.dll
-         libwinpthread-1.dll libxml2-2.dll zlib1.dll)
+         libpng16-16.dll librsvg-2-2.dll libstdc++-6.dll libthai-0.dll
+         libwinpthread-1.dll libxml2-2.dll perl528.dll zlib1.dll)
   EXECUTE_PROCESS (COMMAND cp /mingw${ARCH}/bin/${binname} ${CMAKE_BINARY_DIR}/bundle/bin)
 ENDFOREACH (binname)
 

data-example

@@ -1 +1 @@
-Subproject commit 6f4a4f1a5738b40e0668924ca51084d0fae9e6f2
+Subproject commit 945c110a472deacbba997b7d72dd7512b0eba5cb

desktop

@@ -1 +1 @@
-Subproject commit 5e989b2bac920dac0bd36bd8177724468c0a69de
+Subproject commit fa03fc7190788634c270d0e6c0734c0bf92946b9

gobject-plugin

@@ -1 +1 @@
-Subproject commit f9fea4fe13189c4501b86832d4affbf5e4646c9b
+Subproject commit e73cf2d921b4249d320d113dd0ffdb666caca853

latex-struct

@@ -1 +1 @@
-Subproject commit 7f9b2714375d454c8cebde7586408fa6fd984cdc
+Subproject commit fd585f9749b0d8f700554b42d23895c88ae76424

laview-templates

@@ -0,0 +1 @@
+Subproject commit c2b834516448dda04d7e70709b3ac09f7e70ed3e

object-example

@@ -1 +1 @@
-Subproject commit 0abb967086b5ca6c3699f0abee35ecb858dad44e
+Subproject commit 8faee221d77e24b3e431507c287915a7e67bcdf0

stand_config

@@ -0,0 +1 @@
+Subproject commit 8e61eb2816aa4a4a5afd3d70121724692ded106d

table_meas

@@ -0,0 +1 @@
+Subproject commit 00c3ee739d5d6417ccda55d9e47703f18f237ac8