CASCADE 6.5 compatibility

diff --git a/configure.ac b/configure.ac
index 15d84b478f8c5ac63cdce3ccd9ca86ddd4dc140d..8be0b6c5389074871cfd16f27b0e229b6120bd9c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -468,6 +468,7 @@ AC_OUTPUT([ \
   resources/Makefile \
   resources/GEOMCatalog.xml \
   resources/SalomeApp.xml \
+  resources/Plugin \
   idl/Makefile \
   Makefile \
 ])

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 86bd50df17a3242647eb76aa9d21728bf98f89a8..6313fd6c72459efb4d8c9a7dba5527ffc78343ef 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -28,7 +28,6 @@ dist_salomeres_DATA =         \
 GEOM_en.xml                    \
 GEOM_fr.xml                    \
 GEOM.config                    \
-Plugin                         \
 GEOMDS_Resources               \
 ImportExport                   \
 ShHealing                      \
@@ -247,4 +246,4 @@ ADVANCED_RESOURCES += dlg_pipetshapefilletrf.png
 dist_salomeres_DATA += $(ADVANCED_RESOURCES)
 
 # VSR: little trick to avoid putting if GEOMCatalog.xml to the distribution archive
-nodist_salomeres_SCRIPTS = GEOMCatalog.xml SalomeApp.xml
+nodist_salomeres_SCRIPTS = GEOMCatalog.xml SalomeApp.xml Plugin

diff --git a/resources/Plugin b/resources/Plugin
deleted file mode 100755 (executable)
index 895d655..0000000
--- a/resources/Plugin
+++ /dev/null
@@ -1,10 +0,0 @@
-! Description of available plugins
-! ********************************
-!
-a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin
-!
-! standard attribute drivers plugin
-!
-ad696000-5b34-11d1-b5ba-00a0c9064368.Location: StdPlugin
-ad696001-5b34-11d1-b5ba-00a0c9064368.Location: StdPlugin
-ad696002-5b34-11d1-b5ba-00a0c9064368.Location: StdPlugin

diff --git a/resources/Plugin.in b/resources/Plugin.in
new file mode 100644 (file)
index 0000000..3d4fad5
--- /dev/null
+++ b/resources/Plugin.in
@@ -0,0 +1,10 @@
+! Description of available plugins
+! ********************************
+!
+a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin
+!
+! standard attribute drivers plugin
+!
+ad696000-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
+ad696001-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@
+ad696002-5b34-11d1-b5ba-00a0c9064368.Location: @CAS_STDPLUGIN@