add some conf files about preferences in binary version 23/6523/4
Allan CORNET [Wed, 29 Feb 2012 13:04:41 +0000 (14:04 +0100)]
Change-Id: I39bf166c014406c2daff075c31c19ab157452769

24 files changed:
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/commons/commons.iss
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/console.iss
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/gui.iss
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/history_manager.iss
scilab/modules/preferences/Makefile.am
scilab/modules/preferences/Makefile.in
scilab/modules/preferences/preferences.iss
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/scinotes.iss
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/ui_data.iss
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/xcos.iss

index b645918..210bb82 100644 (file)
@@ -20,8 +20,10 @@ libscicommons_la_root_DATA =  license.txt
 
 #### commons : init scripts ####
 libscicommons_la_etcdir = $(mydatadir)/etc
-libscicommons_la_etc_DATA = etc/commons.quit \
-                               etc/commons.start
+libscicommons_la_etc_DATA = \
+       etc/commons.quit \
+       etc/commons.start \
+       etc/XConfiguration-general.xsl
 
 include $(top_srcdir)/Makefile.incl.am
 
index 0e3e73b..eaa697e 100644 (file)
@@ -448,8 +448,10 @@ libscicommons_la_root_DATA = license.txt
 
 #### commons : init scripts ####
 libscicommons_la_etcdir = $(mydatadir)/etc
-libscicommons_la_etc_DATA = etc/commons.quit \
-                               etc/commons.start
+libscicommons_la_etc_DATA = \
+       etc/commons.quit \
+       etc/commons.start \
+       etc/XConfiguration-general.xsl
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
index 1b55162..03abca5 100644 (file)
@@ -25,6 +25,8 @@ Source: modules\{#COMMONS}\license.txt; DestDir: {app}\modules\{#COMMONS}; Compo
 ;
 Source: modules\{#COMMONS}\etc\{#COMMONS}.quit; DestDir: {app}\modules\{#COMMONS}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#COMMONS}\etc\{#COMMONS}.start; DestDir: {app}\modules\{#COMMONS}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#COMMONS}\etc\*.xml; DestDir: {app}\modules\{#COMMONS}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#COMMONS}\etc\*.xsl; DestDir: {app}\modules\{#COMMONS}\etc; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#COMMONS}\macros\buildmacros.sce; DestDir: {app}\modules\{#COMMONS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#COMMONS}\macros\buildmacros.bat; DestDir: {app}\modules\{#COMMONS}\macros; Components: {#COMPN_SCILAB}
index 9f37435..3172943 100644 (file)
@@ -23,8 +23,14 @@ libsciconsole_la_root_DATA =  license.txt
 
 #### console : init scripts ####
 libsciconsole_la_etcdir = $(mydatadir)/etc
-libsciconsole_la_etc_DATA = etc/console.quit etc/console.start etc/configuration.xml
-
+libsciconsole_la_etc_DATA = \
+       etc/console.quit \
+       etc/console.start \
+       etc/configuration.xml \
+       etc/XConfiguration-console.xml \
+       etc/XConfiguration-console.xsl \
+       etc/XConfiguration-general.xml \
+       etc/XConfiguration-general.xsl
 
 #### console : List of the cpp files ####
 CONSOLE_CPP_JNI_SOURCES = src/jni/CallScilabBridge.cpp
index e209777..cde719f 100644 (file)
@@ -539,7 +539,15 @@ libsciconsole_la_root_DATA = license.txt
 
 #### console : init scripts ####
 libsciconsole_la_etcdir = $(mydatadir)/etc
-libsciconsole_la_etc_DATA = etc/console.quit etc/console.start etc/configuration.xml
+libsciconsole_la_etc_DATA = \
+       etc/console.quit \
+       etc/console.start \
+       etc/configuration.xml \
+       etc/XConfiguration-console.xml \
+       etc/XConfiguration-console.xsl \
+       etc/XConfiguration-general.xml \
+       etc/XConfiguration-general.xsl
+
 
 #### console : List of the cpp files ####
 CONSOLE_CPP_JNI_SOURCES = src/jni/CallScilabBridge.cpp
index 7ed9418..ce97297 100644 (file)
@@ -37,7 +37,8 @@ Source: modules\{#CONSOLE}\includes\*.h; DestDir: {app}\modules\{#CONSOLE}\inclu
 Source: modules\{#CONSOLE}\etc\{#CONSOLE}.quit; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#CONSOLE}\etc\{#CONSOLE}.start; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB}
 ;
-Source: modules\{#CONSOLE}\etc\configuration.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\etc\*.xml; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#CONSOLE}\etc\*.xsl; DestDir: {app}\modules\{#CONSOLE}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#CONSOLE}\macros\buildmacros.sce; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#CONSOLE}\macros\buildmacros.bat; DestDir: {app}\modules\{#CONSOLE}\macros; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
index 192806a..843ac07 100644 (file)
@@ -24,15 +24,22 @@ libscigui_la_root_DATA =  license.txt
 
 #### gui : init scripts ####
 libscigui_la_etcdir = $(mydatadir)/etc
-libscigui_la_etc_DATA = etc/gui.quit \
-etc/gui.start \
-etc/graphics_menubar.xml \
-etc/graphics_toolbar.xml \
-etc/helpbrowser_menubar.xml \
-etc/main_menubar.xml \
-etc/main_toolbar.xml \
-etc/flexdock-themes.xml \
-etc/windowsConfiguration.xml
+libscigui_la_etc_DATA = \
+       etc/gui.quit \
+       etc/gui.start \
+       etc/graphics_menubar.xml \
+       etc/graphics_toolbar.xml \
+       etc/helpbrowser_menubar.xml \
+       etc/main_menubar.xml \
+       etc/main_toolbar.xml \
+       etc/flexdock-themes.xml \
+       etc/windowsConfiguration.xml \
+       etc/XConfiguration-colors.xml \
+       etc/XConfiguration-colors.xsl \
+       etc/XConfiguration-font.xml \
+       etc/XConfiguration-font.xsl \
+       etc/XConfiguration-toolbars.xml \
+       etc/XConfiguration-toolbars.xsl
 
 #### gui : tree functions ####
 MACROSDIRSEXT = macros/tree
index 5e4d9fe..192498e 100644 (file)
@@ -560,15 +560,22 @@ libscigui_la_root_DATA = license.txt
 
 #### gui : init scripts ####
 libscigui_la_etcdir = $(mydatadir)/etc
-libscigui_la_etc_DATA = etc/gui.quit \
-etc/gui.start \
-etc/graphics_menubar.xml \
-etc/graphics_toolbar.xml \
-etc/helpbrowser_menubar.xml \
-etc/main_menubar.xml \
-etc/main_toolbar.xml \
-etc/flexdock-themes.xml \
-etc/windowsConfiguration.xml
+libscigui_la_etc_DATA = \
+       etc/gui.quit \
+       etc/gui.start \
+       etc/graphics_menubar.xml \
+       etc/graphics_toolbar.xml \
+       etc/helpbrowser_menubar.xml \
+       etc/main_menubar.xml \
+       etc/main_toolbar.xml \
+       etc/flexdock-themes.xml \
+       etc/windowsConfiguration.xml \
+       etc/XConfiguration-colors.xml \
+       etc/XConfiguration-colors.xsl \
+       etc/XConfiguration-font.xml \
+       etc/XConfiguration-font.xsl \
+       etc/XConfiguration-toolbars.xml \
+       etc/XConfiguration-toolbars.xsl
 
 
 #### gui : tree functions ####
index 32f85d4..6e2c873 100644 (file)
@@ -37,6 +37,7 @@ Source: modules\{#GUI}\etc\{#GUI}.quit; DestDir: {app}\modules\{#GUI}\etc; Compo
 Source: modules\{#GUI}\etc\{#GUI}.start; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#GUI}\etc\*.xml; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#GUI}\etc\*.xsl; DestDir: {app}\modules\{#GUI}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#GUI}\images\icons\*.png; DestDir: {app}\modules\{#GUI}\images\icons; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 ;Source: modules\{#GUI}\includes\*.h; DestDir: {app}\modules\{#GUI}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
index 6c9152d..f6d66dc 100644 (file)
@@ -95,7 +95,11 @@ libscihistory_manager_la_root_DATA =  license.txt
 
 #### history_manager : init scripts ####
 libscihistory_manager_la_etcdir = $(mydatadir)/etc
-libscihistory_manager_la_etc_DATA = etc/history_manager.quit etc/history_manager.start
+libscihistory_manager_la_etc_DATA = \
+       etc/history_manager.quit \
+       etc/history_manager.start \
+       etc/XConfiguration-history.xml \
+       etc/XConfiguration-history.xsl
 
 #### history_manager : gateway declaration ####
 libscihistory_manager_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index c972104..646adc5 100644 (file)
@@ -526,7 +526,12 @@ libscihistory_manager_la_root_DATA = license.txt
 
 #### history_manager : init scripts ####
 libscihistory_manager_la_etcdir = $(mydatadir)/etc
-libscihistory_manager_la_etc_DATA = etc/history_manager.quit etc/history_manager.start
+libscihistory_manager_la_etc_DATA = \
+       etc/history_manager.quit \
+       etc/history_manager.start \
+       etc/XConfiguration-history.xml \
+       etc/XConfiguration-history.xsl
+
 
 #### history_manager : gateway declaration ####
 libscihistory_manager_la_sci_gatewaydir = $(mydatadir)/sci_gateway
index 48a1d28..6736b69 100644 (file)
@@ -33,6 +33,8 @@ Source: modules\{#HISTORY_MANAGER}\sci_gateway\{#HISTORY_MANAGER}_gateway.xml; D
 ;
 Source: modules\{#HISTORY_MANAGER}\etc\{#HISTORY_MANAGER}.quit; DestDir: {app}\modules\{#HISTORY_MANAGER}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#HISTORY_MANAGER}\etc\{#HISTORY_MANAGER}.start; DestDir: {app}\modules\{#HISTORY_MANAGER}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#HISTORY_MANAGER}\etc\*.xml; DestDir: {app}\modules\{#HISTORY_MANAGER}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#HISTORY_MANAGER}\etc\*.xsl; DestDir: {app}\modules\{#HISTORY_MANAGER}\etc; Components: {#COMPN_SCILAB}
 ;
 ;Source: modules\{#HISTORY_MANAGER}\macros\buildmacros.sce; DestDir: {app}\modules\{#HISTORY_MANAGER}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#HISTORY_MANAGER}\macros\buildmacros.bat; DestDir: {app}\modules\{#HISTORY_MANAGER}\macros; Components: {#COMPN_SCILAB}
index 1644acf..78c7185 100644 (file)
@@ -20,11 +20,26 @@ libscipreferences_la_root_DATA =  license.txt
 
 #### preferences : init scripts & configuration files ####
 libscipreferences_la_etcdir = $(mydatadir)/etc
-libscipreferences_la_etc_DATA = 
+libscipreferences_la_etc_DATA = \
+       etc/preferences.quit \
+       etc/preferences.start \
+       etc/XConfiguration.xml \
+       etc/XWizard-expression.xml \
+       etc/XWizard-function.xml \
+       etc/XWizard-xcos.xml \
+       etc/XWizard.xml
+
+#### preferences : xslt files ####
+libscipreferences_la_src_xsltdir = $(mydatadir)/src/xslt/
+libscipreferences_la_src_xslt_DATA = \
+       src/xslt/XCommon-toolbars.xsl \
+       src/xslt/XCommon.xsl \
+       src/xslt/XConfiguration.xsl \
+       src/xslt/XGeneric.xsl \
+       src/xslt/XWizard.xsl
 
 include $(top_srcdir)/Makefile.incl.am
 
-
 PREFERENCES_JNI_SOURCES = src/jni/ScilabPreferences.cpp
 
 PREFERENCES_C_SOURCES =
index 31c33a0..62d4d4a 100644 (file)
@@ -120,7 +120,8 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libscipreferences_la_etcdir)" \
        "$(DESTDIR)$(libscipreferences_la_rootdir)" \
-       "$(DESTDIR)$(libscipreferences_la_sci_gatewaydir)"
+       "$(DESTDIR)$(libscipreferences_la_sci_gatewaydir)" \
+       "$(DESTDIR)$(libscipreferences_la_src_xsltdir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libscipreferences_algo_la_LIBADD =
 am__objects_1 =
@@ -182,7 +183,8 @@ DIST_SOURCES = $(libscipreferences_algo_la_SOURCES) \
        $(libscipreferences_la_SOURCES)
 DATA = $(libscipreferences_la_etc_DATA) \
        $(libscipreferences_la_root_DATA) \
-       $(libscipreferences_la_sci_gateway_DATA)
+       $(libscipreferences_la_sci_gateway_DATA) \
+       $(libscipreferences_la_src_xslt_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -447,7 +449,25 @@ libscipreferences_la_root_DATA = license.txt
 
 #### preferences : init scripts & configuration files ####
 libscipreferences_la_etcdir = $(mydatadir)/etc
-libscipreferences_la_etc_DATA = 
+libscipreferences_la_etc_DATA = \
+       etc/preferences.quit \
+       etc/preferences.start \
+       etc/XConfiguration.xml \
+       etc/XWizard-expression.xml \
+       etc/XWizard-function.xml \
+       etc/XWizard-xcos.xml \
+       etc/XWizard.xml
+
+
+#### preferences : xslt files ####
+libscipreferences_la_src_xsltdir = $(mydatadir)/src/xslt/
+libscipreferences_la_src_xslt_DATA = \
+       src/xslt/XCommon-toolbars.xsl \
+       src/xslt/XCommon.xsl \
+       src/xslt/XConfiguration.xsl \
+       src/xslt/XGeneric.xsl \
+       src/xslt/XWizard.xsl
+
 
 # Where all the Scilab stuff is installed (macros, help, ...)
 mydatadir = $(pkgdatadir)/modules/$(modulename)
@@ -804,6 +824,24 @@ uninstall-libscipreferences_la_sci_gatewayDATA:
        @list='$(libscipreferences_la_sci_gateway_DATA)'; test -n "$(libscipreferences_la_sci_gatewaydir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(libscipreferences_la_sci_gatewaydir)'; $(am__uninstall_files_from_dir)
+install-libscipreferences_la_src_xsltDATA: $(libscipreferences_la_src_xslt_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(libscipreferences_la_src_xsltdir)" || $(MKDIR_P) "$(DESTDIR)$(libscipreferences_la_src_xsltdir)"
+       @list='$(libscipreferences_la_src_xslt_DATA)'; test -n "$(libscipreferences_la_src_xsltdir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscipreferences_la_src_xsltdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(libscipreferences_la_src_xsltdir)" || exit $$?; \
+       done
+
+uninstall-libscipreferences_la_src_xsltDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libscipreferences_la_src_xslt_DATA)'; test -n "$(libscipreferences_la_src_xsltdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(libscipreferences_la_src_xsltdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -893,7 +931,7 @@ check: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscipreferences_la_etcdir)" "$(DESTDIR)$(libscipreferences_la_rootdir)" "$(DESTDIR)$(libscipreferences_la_sci_gatewaydir)"; do \
+       for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscipreferences_la_etcdir)" "$(DESTDIR)$(libscipreferences_la_rootdir)" "$(DESTDIR)$(libscipreferences_la_sci_gatewaydir)" "$(DESTDIR)$(libscipreferences_la_src_xsltdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: $(BUILT_SOURCES)
@@ -954,7 +992,8 @@ info-am:
 install-data-am: install-data-local \
        install-libscipreferences_la_etcDATA \
        install-libscipreferences_la_rootDATA \
-       install-libscipreferences_la_sci_gatewayDATA
+       install-libscipreferences_la_sci_gatewayDATA \
+       install-libscipreferences_la_src_xsltDATA
 
 install-dvi: install-dvi-am
 
@@ -1003,6 +1042,7 @@ ps-am:
 uninstall-am: uninstall-libscipreferences_la_etcDATA \
        uninstall-libscipreferences_la_rootDATA \
        uninstall-libscipreferences_la_sci_gatewayDATA \
+       uninstall-libscipreferences_la_src_xsltDATA \
        uninstall-pkglibLTLIBRARIES
 
 .MAKE: all check check-am install install-am install-strip
@@ -1018,7 +1058,8 @@ uninstall-am: uninstall-libscipreferences_la_etcDATA \
        install-html-am install-html-local install-info \
        install-info-am install-libscipreferences_la_etcDATA \
        install-libscipreferences_la_rootDATA \
-       install-libscipreferences_la_sci_gatewayDATA install-man \
+       install-libscipreferences_la_sci_gatewayDATA \
+       install-libscipreferences_la_src_xsltDATA install-man \
        install-pdf install-pdf-am install-pkglibLTLIBRARIES \
        install-ps install-ps-am install-strip installcheck \
        installcheck-am installdirs maintainer-clean \
@@ -1028,6 +1069,7 @@ uninstall-am: uninstall-libscipreferences_la_etcDATA \
        uninstall-libscipreferences_la_etcDATA \
        uninstall-libscipreferences_la_rootDATA \
        uninstall-libscipreferences_la_sci_gatewayDATA \
+       uninstall-libscipreferences_la_src_xsltDATA \
        uninstall-pkglibLTLIBRARIES
 
 
index f226fdb..d7adfc5 100644 (file)
@@ -28,6 +28,9 @@ Source: modules\{#PREFERENCES}\sci_gateway\{#PREFERENCES}_gateway.xml; DestDir:
 ;
 Source: modules\{#PREFERENCES}\etc\{#PREFERENCES}.quit; DestDir: {app}\modules\{#PREFERENCES}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#PREFERENCES}\etc\{#PREFERENCES}.start; DestDir: {app}\modules\{#PREFERENCES}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#PREFERENCES}\etc\*.xml; DestDir: {app}\modules\{#PREFERENCES}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+;
+Source: modules\{#PREFERENCES}\src\xslt\*.xsl; DestDir: {app}\modules\{#PREFERENCES}\xslt; Components: {#COMPN_PREFERENCES}
 ;
 ;Source: modules\{#PREFERENCES}\includes\*.h; DestDir: {app}\modules\{#PREFERENCES}\includes; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
index ad5dbde..e5cccde 100644 (file)
@@ -20,11 +20,14 @@ libsciscinotes_la_root_DATA =  license.txt
 
 #### scinotes : init scripts & configuration files ####
 libsciscinotes_la_etcdir = $(mydatadir)/etc
-libsciscinotes_la_etc_DATA = etc/scinotesConfiguration.xml \
-    etc/keysConfiguration.xml \
-    etc/scinotesGUIConfiguration.xml \
-    etc/scinotes.quit \
-    etc/scinotes.start
+libsciscinotes_la_etc_DATA = \
+       etc/scinotesConfiguration.xml \
+       etc/keysConfiguration.xml \
+       etc/scinotesGUIConfiguration.xml \
+       etc/scinotes.quit \
+       etc/scinotes.start \
+       etc/XConfiguration-scinotes.xml \
+       etc/XConfiguration-scinotes.xsl
 
 include $(top_srcdir)/Makefile.incl.am
 
index 28b310d..cdf7439 100644 (file)
@@ -444,11 +444,14 @@ libsciscinotes_la_root_DATA = license.txt
 
 #### scinotes : init scripts & configuration files ####
 libsciscinotes_la_etcdir = $(mydatadir)/etc
-libsciscinotes_la_etc_DATA = etc/scinotesConfiguration.xml \
-    etc/keysConfiguration.xml \
-    etc/scinotesGUIConfiguration.xml \
-    etc/scinotes.quit \
-    etc/scinotes.start
+libsciscinotes_la_etc_DATA = \
+       etc/scinotesConfiguration.xml \
+       etc/keysConfiguration.xml \
+       etc/scinotesGUIConfiguration.xml \
+       etc/scinotes.quit \
+       etc/scinotes.start \
+       etc/XConfiguration-scinotes.xml \
+       etc/XConfiguration-scinotes.xsl
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
index bbaa547..9e7eaea 100644 (file)
@@ -27,9 +27,8 @@ Source: modules\{#SCINOTES}\sci_gateway\{#SCINOTES}_gateway.xml; DestDir: {app}\
 ;
 Source: modules\{#SCINOTES}\etc\{#SCINOTES}.quit; DestDir: {app}\modules\{#SCINOTES}\etc; Components: {#COMPN_SCINOTES}
 Source: modules\{#SCINOTES}\etc\{#SCINOTES}.start; DestDir: {app}\modules\{#SCINOTES}\etc; Components: {#COMPN_SCINOTES}
-Source: modules\{#SCINOTES}\etc\{#SCINOTES}Configuration.xml; DestDir: {app}\modules\{#SCINOTES}\etc; Components: {#COMPN_SCINOTES}
-Source: modules\{#SCINOTES}\etc\keysConfiguration.xml; DestDir: {app}\modules\{#SCINOTES}\etc; Components: {#COMPN_SCINOTES}
-Source: modules\{#SCINOTES}\etc\{#SCINOTES}GUIConfiguration.xml; DestDir: {app}\modules\{#SCINOTES}\etc; Components: {#COMPN_SCINOTES}
+Source: modules\{#SCINOTES}\etc\*.xml; DestDir: {app}\modules\{#SCINOTES}\etc; Components: {#COMPN_SCINOTES}
+Source: modules\{#SCINOTES}\etc\*.xsl; DestDir: {app}\modules\{#SCINOTES}\etc; Components: {#COMPN_SCINOTES}
 ;
 Source: modules\{#SCINOTES}\macros\lib; DestDir: {app}\modules\{#SCINOTES}\macros; Components: {#COMPN_SCINOTES}
 Source: modules\{#SCINOTES}\macros\names; DestDir: {app}\modules\{#SCINOTES}\macros; Components: {#COMPN_SCINOTES}
index dafc4cb..eb68ed5 100644 (file)
@@ -20,10 +20,13 @@ libsciui_data_la_root_DATA =  license.txt
 
 #### ui_data : init scripts ####
 libsciui_data_la_etcdir = $(mydatadir)/etc
-libsciui_data_la_etc_DATA = etc/ui_data.quit \
-                               etc/ui_data.start \
-                               etc/variablebrowser_menubar.xml \
-                               etc/variableeditor_menubar.xml
+libsciui_data_la_etc_DATA = \
+       etc/ui_data.quit \
+       etc/ui_data.start \
+       etc/variablebrowser_menubar.xml \
+       etc/variableeditor_menubar.xml \
+       etc/XConfiguration-variables.xml \
+       etc/XConfiguration-variables.xsl
 
 include $(top_srcdir)/Makefile.incl.am
 
index a61a8a1..aa08d89 100644 (file)
@@ -451,10 +451,13 @@ libsciui_data_la_root_DATA = license.txt
 
 #### ui_data : init scripts ####
 libsciui_data_la_etcdir = $(mydatadir)/etc
-libsciui_data_la_etc_DATA = etc/ui_data.quit \
-                               etc/ui_data.start \
-                               etc/variablebrowser_menubar.xml \
-                               etc/variableeditor_menubar.xml
+libsciui_data_la_etc_DATA = \
+       etc/ui_data.quit \
+       etc/ui_data.start \
+       etc/variablebrowser_menubar.xml \
+       etc/variableeditor_menubar.xml \
+       etc/XConfiguration-variables.xml \
+       etc/XConfiguration-variables.xsl
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
index 03f491e..27c98ea 100644 (file)
@@ -20,8 +20,8 @@ Source: modules\{#UI_DATA}\jar\org.scilab.modules.{#UI_DATA}.jar;DestDir: {app}\
 ;
 Source: modules\{#UI_DATA}\etc\{#UI_DATA}.start;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 Source: modules\{#UI_DATA}\etc\{#UI_DATA}.quit;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#UI_DATA}\etc\variablebrowser_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
-Source: modules\{#UI_DATA}\etc\variableeditor_menubar.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#UI_DATA}\etc\*.xml;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
+Source: modules\{#UI_DATA}\etc\*.xsl;DestDir: {app}\modules\{#UI_DATA}\etc; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
 Source: modules\{#UI_DATA}\sci_gateway\{#UI_DATA}_gateway.xml; DestDir: {app}\modules\{#UI_DATA}\sci_gateway; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 ;
index fdb364b..1ab06c9 100644 (file)
@@ -21,15 +21,18 @@ libscixcos_la_root_DATA =  license.txt
 
 #### xcos : init scripts ####
 libscixcos_la_etcdir = $(mydatadir)/etc
-libscixcos_la_etc_DATA =       etc/xcos.quit \
-                               etc/xcos.start \
-                               etc/Xcos-style.xml \
-                               etc/XcosFile.xsd \
-                               etc/xcos.xml \
-                               etc/XcosConfiguration.xsd \
-                               etc/palettes.xml \
-                               etc/PaletteConfiguration.xsd \
-                               etc/Modelica.xsd
+libscixcos_la_etc_DATA = \
+       etc/xcos.quit \
+       etc/xcos.start \
+       etc/Xcos-style.xml \
+       etc/XcosFile.xsd \
+       etc/xcos.xml \
+       etc/XcosConfiguration.xsd \
+       etc/palettes.xml \
+       etc/PaletteConfiguration.xsd \
+       etc/Modelica.xsd \
+       etc/XConfiguration-xcos.xsl \
+       etc/XConfiguration-xcos.xml
 
 XCOS_C_SOURCES =
 
index 008c7f9..8f5be69 100644 (file)
@@ -456,15 +456,18 @@ libscixcos_la_root_DATA = license.txt
 
 #### xcos : init scripts ####
 libscixcos_la_etcdir = $(mydatadir)/etc
-libscixcos_la_etc_DATA = etc/xcos.quit \
-                               etc/xcos.start \
-                               etc/Xcos-style.xml \
-                               etc/XcosFile.xsd \
-                               etc/xcos.xml \
-                               etc/XcosConfiguration.xsd \
-                               etc/palettes.xml \
-                               etc/PaletteConfiguration.xsd \
-                               etc/Modelica.xsd
+libscixcos_la_etc_DATA = \
+       etc/xcos.quit \
+       etc/xcos.start \
+       etc/Xcos-style.xml \
+       etc/XcosFile.xsd \
+       etc/xcos.xml \
+       etc/XcosConfiguration.xsd \
+       etc/palettes.xml \
+       etc/PaletteConfiguration.xsd \
+       etc/Modelica.xsd \
+       etc/XConfiguration-xcos.xsl \
+       etc/XConfiguration-xcos.xml
 
 XCOS_C_SOURCES = 
 XCOS_CPP_SOURCES = src/cpp/callxcos.cpp \
index 13e22ed..736b1ac 100644 (file)
@@ -29,6 +29,7 @@ Source: modules\{#XCOS}\sci_gateway\{#XCOS}_gateway.xml; DestDir: {app}\modules\
 Source: modules\{#XCOS}\etc\{#XCOS}.quit; DestDir: {app}\modules\{#XCOS}\etc; Components: {#COMPN_XCOS}
 Source: modules\{#XCOS}\etc\{#XCOS}.start; DestDir: {app}\modules\{#XCOS}\etc; Components: {#COMPN_XCOS}
 Source: modules\{#XCOS}\etc\*.xml; DestDir: {app}\modules\{#XCOS}\etc; Components: {#COMPN_XCOS}
+Source: modules\{#XCOS}\etc\*.xsl; DestDir: {app}\modules\{#XCOS}\etc; Components: {#COMPN_XCOS}
 Source: modules\{#XCOS}\etc\*.xsd; DestDir: {app}\modules\{#XCOS}\etc; Components: {#COMPN_XCOS}
 ;
 Source: modules\{#XCOS}\includes\*.h; DestDir: {app}\modules\{#XCOS}\includes; Components: {#COMPN_XCOS}