Fix binary versions (missing .xml files for GUIs) 71/13971/2
Vincent COUVERT [Tue, 11 Mar 2014 10:16:01 +0000 (11:16 +0100)]
Change-Id: Ib717a669bb11e7886a62a47ce6d27eb0a83bdb64

scilab/modules/demo_tools/Makefile.am
scilab/modules/demo_tools/Makefile.in
scilab/modules/demo_tools/demo_tools.iss
scilab/modules/demo_tools/gui/demo_gui.xml [moved from scilab/modules/demo_tools/macros/demo_gui.xml with 100% similarity]
scilab/modules/demo_tools/macros/demo_gui.sci
scilab/modules/javasci/Makefile.in

index da743d5..9fd92d3 100644 (file)
@@ -15,6 +15,10 @@ libdemo_tools_la_root_DATA =  license.txt
 libdemo_tools_la_etcdir = $(mydatadir)/etc
 libdemo_tools_la_etc_DATA = etc/demo_tools.quit etc/demo_tools.start
 
+#### demo_tools : XML gui ####
+libdemo_tools_la_guidir = $(mydatadir)/gui
+libdemo_tools_la_gui_DATA = gui/demo_gui.xml
+
 ####┬ádemo_tools : images files ####
 libdemo_tools_la_imagesdir=$(mydatadir)/images
 libdemo_tools_la_images_DATA = images/logo_scilab.png
index c04385c..3c8391d 100644 (file)
@@ -174,10 +174,11 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(libdemo_tools_la_etcdir)" \
+       "$(DESTDIR)$(libdemo_tools_la_guidir)" \
        "$(DESTDIR)$(libdemo_tools_la_imagesdir)" \
        "$(DESTDIR)$(libdemo_tools_la_rootdir)"
-DATA = $(libdemo_tools_la_etc_DATA) $(libdemo_tools_la_images_DATA) \
-       $(libdemo_tools_la_root_DATA)
+DATA = $(libdemo_tools_la_etc_DATA) $(libdemo_tools_la_gui_DATA) \
+       $(libdemo_tools_la_images_DATA) $(libdemo_tools_la_root_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -463,6 +464,10 @@ libdemo_tools_la_root_DATA = license.txt
 libdemo_tools_la_etcdir = $(mydatadir)/etc
 libdemo_tools_la_etc_DATA = etc/demo_tools.quit etc/demo_tools.start
 
+#### demo_tools : XML gui ####
+libdemo_tools_la_guidir = $(mydatadir)/gui
+libdemo_tools_la_gui_DATA = gui/demo_gui.xml
+
 ####┬ádemo_tools : images files ####
 libdemo_tools_la_imagesdir = $(mydatadir)/images
 libdemo_tools_la_images_DATA = images/logo_scilab.png
@@ -601,6 +606,27 @@ uninstall-libdemo_tools_la_etcDATA:
        @list='$(libdemo_tools_la_etc_DATA)'; test -n "$(libdemo_tools_la_etcdir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        dir='$(DESTDIR)$(libdemo_tools_la_etcdir)'; $(am__uninstall_files_from_dir)
+install-libdemo_tools_la_guiDATA: $(libdemo_tools_la_gui_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(libdemo_tools_la_gui_DATA)'; test -n "$(libdemo_tools_la_guidir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(libdemo_tools_la_guidir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(libdemo_tools_la_guidir)" || exit 1; \
+       fi; \
+       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)$(libdemo_tools_la_guidir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(libdemo_tools_la_guidir)" || exit $$?; \
+       done
+
+uninstall-libdemo_tools_la_guiDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(libdemo_tools_la_gui_DATA)'; test -n "$(libdemo_tools_la_guidir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(libdemo_tools_la_guidir)'; $(am__uninstall_files_from_dir)
 install-libdemo_tools_la_imagesDATA: $(libdemo_tools_la_images_DATA)
        @$(NORMAL_INSTALL)
        @list='$(libdemo_tools_la_images_DATA)'; test -n "$(libdemo_tools_la_imagesdir)" || list=; \
@@ -685,7 +711,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA) all-local
 installdirs:
-       for dir in "$(DESTDIR)$(libdemo_tools_la_etcdir)" "$(DESTDIR)$(libdemo_tools_la_imagesdir)" "$(DESTDIR)$(libdemo_tools_la_rootdir)"; do \
+       for dir in "$(DESTDIR)$(libdemo_tools_la_etcdir)" "$(DESTDIR)$(libdemo_tools_la_guidir)" "$(DESTDIR)$(libdemo_tools_la_imagesdir)" "$(DESTDIR)$(libdemo_tools_la_rootdir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -739,6 +765,7 @@ info: info-am
 info-am:
 
 install-data-am: install-data-local install-libdemo_tools_la_etcDATA \
+       install-libdemo_tools_la_guiDATA \
        install-libdemo_tools_la_imagesDATA \
        install-libdemo_tools_la_rootDATA
 
@@ -785,6 +812,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-libdemo_tools_la_etcDATA \
+       uninstall-libdemo_tools_la_guiDATA \
        uninstall-libdemo_tools_la_imagesDATA \
        uninstall-libdemo_tools_la_rootDATA
 
@@ -798,6 +826,7 @@ uninstall-am: uninstall-libdemo_tools_la_etcDATA \
        install-dvi install-dvi-am install-exec install-exec-am \
        install-html install-html-am install-html-local install-info \
        install-info-am install-libdemo_tools_la_etcDATA \
+       install-libdemo_tools_la_guiDATA \
        install-libdemo_tools_la_imagesDATA \
        install-libdemo_tools_la_rootDATA install-man install-pdf \
        install-pdf-am install-ps install-ps-am install-strip \
@@ -805,6 +834,7 @@ uninstall-am: uninstall-libdemo_tools_la_etcDATA \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
        mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
        uninstall-am uninstall-libdemo_tools_la_etcDATA \
+       uninstall-libdemo_tools_la_guiDATA \
        uninstall-libdemo_tools_la_imagesDATA \
        uninstall-libdemo_tools_la_rootDATA
 
index 3355b9b..166f4a6 100644 (file)
@@ -33,6 +33,8 @@ Source: modules\{#DEMO_TOOLS}\macros\names; DestDir: {app}\modules\{#DEMO_TOOLS}
 Source: modules\{#DEMO_TOOLS}\macros\*.bin; DestDir: {app}\modules\{#DEMO_TOOLS}\macros; Components: {#COMPN_SCILAB}
 Source: modules\{#DEMO_TOOLS}\macros\*.sci; DestDir: {app}\modules\{#DEMO_TOOLS}\macros; Components: {#COMPN_SCILAB}
 ;
+Source: modules\{#DEMO_TOOLS}\gui\*.xml; DestDir: {app}\modules\{#DEMO_TOOLS}\gui; Components: {#COMPN_SCILAB}
+;
 ;Source: modules\{#DEMO_TOOLS}\examples\*.*; DestDir: {app}\modules\{#DEMO_TOOLS}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#DEMO_TOOLS}\tests\*.*; DestDir: {app}\modules\{#DEMO_TOOLS}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
index 1968558..7aa2bbb 100644 (file)
@@ -37,7 +37,7 @@ function demo_gui()
 
     // Figure creation
     // =========================================================================
-    demo_fig = loadGui(SCI + "/modules/demo_tools/macros/demo_gui.xml");
+    demo_fig = loadGui(SCI + "/modules/demo_tools/gui/demo_gui.xml");
 
     // Parameters
     // =========================================================================
index 116b47f..7e7addd 100644 (file)
@@ -972,8 +972,8 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @JAVASCI_FALSE@distclean-local:
-@JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@install-data-local:
+@JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@clean-local:
 clean: clean-am