Examples updated for the new API which generates modules for cmake.

Aster examples (ast*) still need to be fixed.
Paco examples (paco*) do not work and will be probably removed.

diff --git a/Examples/calcium1/Makefile b/Examples/calcium1/Makefile
index a6f538c3c55db01e81c7c2ebc86e9496ce748498..a6ccdbbede22d7c5398e2897d4263ae971fb2fea 100644 (file)
--- a/Examples/calcium1/Makefile
+++ b/Examples/calcium1/Makefile
@@ -27,4 +27,4 @@ code1.o:code1.f
          $(FC) -c code1.f -fPIC -I$(KERNEL_ROOT_DIR)/include/salome -fexceptions
 
 clean:
-       rm -rf *.o *.so install install.bak traceExec_proc appli appli.bak pycompos_SRC pycompos_SRC.bak
+       rm -rf *.o *.so install install.bak traceExec_proc appli appli.bak pycompos_SRC pycompos_SRC.bak pycompos_build pycompos_build.bak

diff --git a/Examples/calcium1/components.py b/Examples/calcium1/components.py
index 150b8b5c62daa11157126494a48b93ca139b0ae2..271268d91533c561321a68b9b36460d1a5b973c6 100644 (file)
--- a/Examples/calcium1/components.py
+++ b/Examples/calcium1/components.py
@@ -21,6 +21,7 @@ import os
 #import context from ..
 execfile("../context.py")
 from module_generator import Generator,Module,Service,PYComponent,CPPComponent,F77Component
+from module_generator import Library
 
 # C++ component
 
@@ -449,13 +450,12 @@ c3=F77Component("fcode1",
                                             ],
                                  ),
                          ],
-                libs="-L%s -lcode1" % cwd,
-                rlibs="-Wl,--rpath -Wl,%s" % cwd,
+                libs=[Library(name="code1", path=cwd)],
+                rlibs=cwd,
                )
 
-g=Generator(Module("pycompos",components=[c1,c2,c3],prefix="./install",layout="multidir"),context)
+g=Generator(Module("pycompos",components=[c1,c2,c3],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/calcium2/Makefile b/Examples/calcium2/Makefile
index a6f538c3c55db01e81c7c2ebc86e9496ce748498..a6ccdbbede22d7c5398e2897d4263ae971fb2fea 100644 (file)
--- a/Examples/calcium2/Makefile
+++ b/Examples/calcium2/Makefile
@@ -27,4 +27,4 @@ code1.o:code1.f
          $(FC) -c code1.f -fPIC -I$(KERNEL_ROOT_DIR)/include/salome -fexceptions
 
 clean:
-       rm -rf *.o *.so install install.bak traceExec_proc appli appli.bak pycompos_SRC pycompos_SRC.bak
+       rm -rf *.o *.so install install.bak traceExec_proc appli appli.bak pycompos_SRC pycompos_SRC.bak pycompos_build pycompos_build.bak

diff --git a/Examples/calcium2/components.py b/Examples/calcium2/components.py
index 7fd81fe3642a1ef9eb7f9fa0d4674fe0767e2d3b..93676f7229305ea46c2749a0f06eff7ab19b088b 100644 (file)
--- a/Examples/calcium2/components.py
+++ b/Examples/calcium2/components.py
@@ -22,6 +22,7 @@ import os
 #import context from ..
 execfile("../context.py")
 from module_generator import Generator,Module,Service,PYComponent,CPPComponent,F77Component
+from module_generator import Library
 
 # C++ component
 
@@ -447,13 +448,12 @@ c3=F77Component("fcode1",
                                             ],
                                  ),
                          ],
-                libs="-L%s -lcode1" % cwd,
-                rlibs="-Wl,--rpath -Wl,%s" % cwd,
+                libs=[Library(name="code1", path=cwd)],
+                rlibs=cwd,
                )
 
-g=Generator(Module("pycompos",components=[c1,c2,c3],prefix="./install",layout="multidir"),context)
+g=Generator(Module("pycompos",components=[c1,c2,c3],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/context.py b/Examples/context.py
index ed2317c9f7c942550cfc6698dc44efcf12385b64..7023d248e3650c30a476fa412a12d7ccd422964c 100644 (file)
--- a/Examples/context.py
+++ b/Examples/context.py
@@ -18,15 +18,15 @@
 #
 
 import os,sys
-sys.path.insert(0,"../..")
 
-SALOME_ROOT=os.path.expanduser("~/Salome/Install")
-SALOME_PREREQ=os.path.expanduser("~/.packages.d/envSalome6main")
+SALOME_ROOT=os.getenv("SALOME_DIR")
+SALOME_PREREQ=os.path.join(SALOME_ROOT, "salome_prerequisites.sh")
+#SALOME_PREREQ=os.path.join(SALOME_ROOT, "salome_prerequisites_appli.sh")
 
-KERNEL_ROOT_DIR=os.getenv("KERNEL_ROOT_DIR",os.path.join(SALOME_ROOT,"KERNEL_V6"))
-GUI_ROOT_DIR=os.getenv("GUI_ROOT_DIR",os.path.join(SALOME_ROOT,"GUI_V6"))
-YACS_ROOT_DIR=os.getenv("YACS_ROOT_DIR",os.path.join(SALOME_ROOT,"YACS_V6"))
-GEOM_ROOT_DIR=os.getenv("GEOM_ROOT_DIR",os.path.join(SALOME_ROOT,"GEOM_V6"))
+KERNEL_ROOT_DIR=os.getenv("KERNEL_ROOT_DIR","")
+GUI_ROOT_DIR=os.getenv("GUI_ROOT_DIR","")
+YACS_ROOT_DIR=os.getenv("YACS_ROOT_DIR","")
+GEOM_ROOT_DIR=os.getenv("GEOM_ROOT_DIR","")
 
 context={'update':1,
          "makeflags":"",

diff --git a/Examples/cpp1/Makefile b/Examples/cpp1/Makefile
index cef684d168a9dd94b9fd41e37020e4a062d2ca26..360fa5a711b593a8a5c974a08695811e5af77933 100644 (file)
--- a/Examples/cpp1/Makefile
+++ b/Examples/cpp1/Makefile
@@ -18,4 +18,4 @@
 #
 
 clean:
-       rm -rf *.o *.so cppcompos_SRC cppcompos_SRC.bak appli appli.bak install install.bak traceExec_proc
+       rm -rf *.o *.so cppcompos_SRC cppcompos_SRC.bak appli appli.bak install install.bak traceExec_proc cppcompos_build.bak cppcompos_build

diff --git a/Examples/cpp1/components.py b/Examples/cpp1/components.py
index 51522a07fa4827a829940642d5198b4fad80278e..d5bf043b9d7779dbfec39287d83a247dbec54ad6 100644 (file)
--- a/Examples/cpp1/components.py
+++ b/Examples/cpp1/components.py
@@ -48,14 +48,12 @@ c1=CPPComponent("compo1",services=[
                        defs="//def1",body=body,
                  ),
           ],
-         includes="-I/usr/include",
          calciumextendedinterface=1,
          )
 
 
 g=Generator(Module("cppcompos",components=[c1],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/cpp2/Makefile b/Examples/cpp2/Makefile
index f8e6318efcadb904067b2840179da04114a7e3f5..7a56c680f977c00f5bb431178fc8761d0245fd52 100644 (file)
--- a/Examples/cpp2/Makefile
+++ b/Examples/cpp2/Makefile
@@ -20,6 +20,6 @@
 include ../makefile.inc
 
 prog:prog.cxx
-       g++ -o prog prog.cxx -L./install/lib/salome -lcompo1Exelib
+       g++ -o prog prog.cxx -L./install/lib/salome -lcompo1Exelib -lSalomeIDLcppcompos
 clean:
-       rm -rf *.o prog install install.bak appli appli.bak cppcompos_SRC cppcompos_SRC.bak compo1_inst_1 traceExec_proc
+       rm -rf *.o prog install install.bak appli appli.bak cppcompos_SRC cppcompos_SRC.bak compo1_inst_1 traceExec_proc cppcompos_build cppcompos_build.bak

diff --git a/Examples/cpp2/components.py b/Examples/cpp2/components.py
index 2a4e02493f8ac83264955753662d4ff587e028ba..94d45abefb3e18708a657614e1b170e96a8ad89e 100644 (file)
--- a/Examples/cpp2/components.py
+++ b/Examples/cpp2/components.py
@@ -48,7 +48,6 @@ c1=CPPComponent("compo1",services=[
                        defs="//def1",body=body,
                  ),
           ],
-         includes="-I/usr/include",
          kind="exe",
          exe_path=os.path.join(cwd,"prog"),
          )
@@ -56,7 +55,6 @@ c1=CPPComponent("compo1",services=[
 
 g=Generator(Module("cppcompos",components=[c1],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/cppgui1/Makefile b/Examples/cppgui1/Makefile
index cef684d168a9dd94b9fd41e37020e4a062d2ca26..360fa5a711b593a8a5c974a08695811e5af77933 100644 (file)
--- a/Examples/cppgui1/Makefile
+++ b/Examples/cppgui1/Makefile
@@ -18,4 +18,4 @@
 #
 
 clean:
-       rm -rf *.o *.so cppcompos_SRC cppcompos_SRC.bak appli appli.bak install install.bak traceExec_proc
+       rm -rf *.o *.so cppcompos_SRC cppcompos_SRC.bak appli appli.bak install install.bak traceExec_proc cppcompos_build.bak cppcompos_build

diff --git a/Examples/cppgui1/components.py b/Examples/cppgui1/components.py
index 13c53811a1798cb5833700e02f8b39b868fbcdf0..fc91a9140d8a2de83d27c09f55dd5925acabc446 100644 (file)
--- a/Examples/cppgui1/components.py
+++ b/Examples/cppgui1/components.py
@@ -103,7 +103,6 @@ c1=CPPComponent("cppcompos",services=[
                        defs="//def1",body=body,
                  ),
           ],
-         includes="-I/usr/include",
          idls=["*.idl"],
          interfacedefs=idldefs,
          inheritedinterface="Idl_A",
@@ -119,7 +118,6 @@ modul=Module("cppcompos",components=[c1],prefix="./install",
 
 g=Generator(modul,context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/exec.sh b/Examples/exec.sh
new file mode 100755 (executable)
index 0000000..d035773
--- /dev/null
+++ b/Examples/exec.sh
@@ -0,0 +1,14 @@
+#/bin/bash
+# execute a command within SALOME environment 
+
+com=$*
+
+# Modify to your SALOME installation
+export SALOME_DIR=/local00/home/I35256/salome/install/V7_main_git
+
+source $SALOME_DIR/salome_prerequisites.sh
+source $SALOME_DIR/salome_modules.sh
+
+echo execution: $com
+$com
+

diff --git a/Examples/fort1/Makefile b/Examples/fort1/Makefile
index f1408377e789b1aee4b3ae03f6aabb2d39af559e..62836c0c2c3e59ce139053ef2cce22c4845f2df4 100644 (file)
--- a/Examples/fort1/Makefile
+++ b/Examples/fort1/Makefile
@@ -24,10 +24,13 @@ libcode1.so:code1.o
          $(FC) -shared -fPIC -o libcode1.so code1.o
 code1.o:code1.f
          $(FC) -c code1.f -fPIC -I$(KERNEL_ROOT_DIR)/include/salome -fexceptions
-libcode2.so:code2.o
-         $(FC) -shared -fPIC -o libcode2.so code2.o
+libcode2.so:code2.o bidul.o
+         $(FC) -shared -fPIC -o libcode2.so code2.o bidul.o
 code2.o:code2.f
          $(FC) -c code2.f -fPIC -I$(KERNEL_ROOT_DIR)/include/salome -fexceptions
 
+bidul.o:bidul.f
+         $(FC) -c bidul.f -fPIC -I$(KERNEL_ROOT_DIR)/include/salome -fexceptions
+
 clean:
-       rm -rf *.o *.so fcompos_SRC  install fcompos_SRC.bak traceExec_proc appli appli.bak install.bak
+       rm -rf *.o *.so fcompos_SRC  install fcompos_SRC.bak traceExec_proc appli appli.bak install.bak fcompos_build fcompos_build.bak

diff --git a/Examples/fort1/components.py b/Examples/fort1/components.py
index 4bb60063949dbb655443f973b3e9f47bbd3301dd..c98bf1f5e0d36fb41f9345e471f6d90a70eeb13b 100644 (file)
--- a/Examples/fort1/components.py
+++ b/Examples/fort1/components.py
@@ -22,14 +22,15 @@ import os
 #import context from ..
 execfile("../context.py")
 from module_generator import Generator,Module,Service,F77Component
+from module_generator import Library
 
 cwd=os.getcwd()
 
 c1=F77Component("fcode1", services=[Service("serv1",inport=[("a","double"),("b","double")],
                          outport=[("c","double")],
                          outstream=[("PARAM","CALCIUM_double","I")],), ],
-                libs="-L%s -lcode1" % cwd,
-                rlibs="-Wl,--rpath -Wl,%s" % cwd,
+                libs = [Library(name="code1", path=cwd)],
+                rlibs = cwd,
                )
 
 c2=F77Component("fcode2", services=[Service("serv1",inport=[("a","double"),("b","double")],
@@ -39,7 +40,6 @@ c2=F77Component("fcode2", services=[Service("serv1",inport=[("a","double"),("b",
 
 g=Generator(Module("fcompos",components=[c1,c2],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/fort2/Makefile b/Examples/fort2/Makefile
index 8bfe7ae5bcff7c4e29caca8bfe89d22f216c2cf4..1e8c25b5b36edabb2507332cb3386df3305b00ff 100644 (file)
--- a/Examples/fort2/Makefile
+++ b/Examples/fort2/Makefile
@@ -19,16 +19,18 @@
 
 include ../makefile.inc
 
+OPT_RPATH=-Wl,-rpath-link,$(KERNEL_ROOT_DIR)/lib/salome -Wl,-rpath-link,install/lib/salome
+
 all:prog1 prog2
 prog1:code1.o
-         $(FC) -o prog1 code1.o -L./install/lib/salome -lfcode1Exelib -L$(KERNEL_ROOT_DIR)/lib/salome -lCalciumC
+         $(FC) -o prog1 code1.o -L./install/lib/salome -lfcode1Exelib -L$(KERNEL_ROOT_DIR)/lib/salome -lCalciumC $(OPT_RPATH)
 code1.o:code1.f
          $(FC) -c code1.f -I$(KERNEL_ROOT_DIR)/include/salome -fexceptions 
 
 prog2:code2.o
-         $(FC) -o prog2 code2.o -L./install/lib/salome -lfcode2Exelib -L$(KERNEL_ROOT_DIR)/lib/salome -lCalciumC
+         $(FC) -o prog2 code2.o -L./install/lib/salome -lfcode2Exelib -L$(KERNEL_ROOT_DIR)/lib/salome -lCalciumC $(OPT_RPATH)
 code2.o:code2.f
          $(FC) -c code2.f -I$(KERNEL_ROOT_DIR)/include/salome -fexceptions 
 
 clean:
-       rm -rf *.o prog1 prog2 fcode1_inst_1  fcode2_inst_1  fcompos_SRC  install traceExec_proc install.bak fcompos_SRC.bak appli appli.bak
+       rm -rf *.o prog1 prog2 fcode1_inst_1  fcode2_inst_1  fcompos_SRC  install traceExec_proc install.bak fcompos_SRC.bak appli appli.bak fcompos_build.bak fcompos_build

diff --git a/Examples/fort2/components.py b/Examples/fort2/components.py
index 49c554788afe768596116967c7297fa192c8a2dd..f441f1c3a49d2ff3fb241e3b5474acc773899023 100644 (file)
--- a/Examples/fort2/components.py
+++ b/Examples/fort2/components.py
@@ -40,7 +40,6 @@ c2=F77Component("fcode2", services=[Service("serv1",inport=[("a","double"),("b",
 
 g=Generator(Module("fcompos",components=[c1,c2],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/hxx1/Makefile b/Examples/hxx1/Makefile
index c00e8f9337a8f0e1fc414f0fdea4f20eff7cff58..6bf9d5296793d0064a499cdba069bc538c3b76c2 100644 (file)
--- a/Examples/hxx1/Makefile
+++ b/Examples/hxx1/Makefile
@@ -18,4 +18,4 @@
 #
 
 clean:
-       rm -rf *.o *.so hxxcompos_SRC hxxcompos_SRC.bak appli appli.bak install install.bak traceExec_proc COMPONENTCPP_INSTALL COMPONENTCPP_SRC COMPONENTCPP_BUILD parse_result parse_type_result
+       rm -rf parse_* appli install hxxcompos_* COMPONENTCPP_* 

diff --git a/Examples/hxx1/build.sh b/Examples/hxx1/build.sh
new file mode 100755 (executable)
index 0000000..da0953e
--- /dev/null
+++ b/Examples/hxx1/build.sh
@@ -0,0 +1,19 @@
+
+# build COMPONENTCPP lib
+tar -xzvf cpp_component.tgz
+mkdir COMPONENTCPP_BUILD
+export HXXTESTPATH=`pwd`
+cd COMPONENTCPP_SRC
+../../exec.sh ./build_configure
+cd ../COMPONENTCPP_BUILD
+../../exec.sh ../COMPONENTCPP_SRC/configure --prefix=$HXXTESTPATH/COMPONENTCPP_INSTALL
+../../exec.sh make
+../../exec.sh make install
+cd ..
+# build & test SALOME component 
+../exec.sh python component.py
+
+appli/salome start -t
+sleep 2
+appli/salome shell python test_compohxx.py
+appli/salome killall

diff --git a/Examples/hxx1/component.py b/Examples/hxx1/component.py
index c69d07aa349f0c1fe6466be4cf39439bf13e1b7a..dfac34f9c45b1a80259b8fa6f4eb816f6cdfc960 100644 (file)
--- a/Examples/hxx1/component.py
+++ b/Examples/hxx1/component.py
@@ -28,7 +28,9 @@ gui_root_dir=os.environ["GUI_ROOT_DIR"]
 yacs_root_dir=os.environ["YACS_ROOT_DIR"]
 med_root_dir=os.environ["MED_ROOT_DIR"]
 geom_root_dir=os.environ["GEOM_ROOT_DIR"]
-prereq_file=os.path.join(kernel_root_dir,"..","env_products.sh")
+SALOME_ROOT=os.getenv("SALOME_DIR")
+prereq_file=os.path.join(SALOME_ROOT, "salome_prerequisites.sh")
+
 if not os.path.exists(prereq_file):
     prereq_file=os.path.join(kernel_root_dir,"..","..","env_products.sh")
 if not os.path.exists(prereq_file):
@@ -60,20 +62,19 @@ c4=HXX2SALOMEComponent("ICOCO.hxx","libICOCOCXX.so" , cpppath )
 
 g=Generator(Module("hxxcompos",components=[c4,c1],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()
 g.make_appli("appli",
-             restrict=["KERNEL","GUI","YACS"],
-             altmodules={"GUI":gui_root_dir,
-                         "MED":med_root_dir,
-                         "YACS":yacs_root_dir,
-                         "GEOM":geom_root_dir})
+             restrict=["KERNEL","GUI","YACS","MED","GEOM"],
+#             altmodules={"GUI":gui_root_dir,
+#                         "MED":med_root_dir,
+#                         "YACS":yacs_root_dir,
+#                         "GEOM":geom_root_dir})
+            )
 cppenv=""" export CALCULCPP_ROOT_DIR=%(cpppath)s
 export ICOCOCPP_ROOT_DIR=%(cpppath)s """  % {"cpppath" : cpppath}
 
 cppenvfile=open("appli/env.d/cppEnv.sh","w")
 cppenvfile.write(cppenv)
 cppenvfile.close()
-

diff --git a/Examples/makefile.inc b/Examples/makefile.inc
index a83bdf12eb4494e07bbf2866ae670862390a4dd9..d708f303e2c595a4e151735ecb5a216746f7e8e2 100644 (file)
--- a/Examples/makefile.inc
+++ b/Examples/makefile.inc
@@ -17,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-KERNEL_ROOT_DIR=$(HOME)/Salome/Install/KERNEL_V6
-MED2HOME=/temp
+#MED2HOME=/temp
 
 ASTER_ROOT=$(HOME)/Aster/V10.3/aster
 ASTER_VERSION=STA10.3

diff --git a/Examples/pydoc1/Makefile b/Examples/pydoc1/Makefile
index 3df18b819d7b2cffcc294531cdde8823c64d125a..d8bc261e66ad277abb4f65f7607e07806622aea6 100644 (file)
--- a/Examples/pydoc1/Makefile
+++ b/Examples/pydoc1/Makefile
@@ -18,4 +18,4 @@
 #
 
 clean:
-       rm -rf *.pyc pycompos_SRC pycompos_SRC.bak appli appli.bak install install.bak traceExec_proc
+       rm -rf *.pyc pycompos_* appli appli.bak install install.bak traceExec_proc

diff --git a/Examples/pydoc1/components.py b/Examples/pydoc1/components.py
index 1878528898f6abbe2f9c61283c3b1208751562de..72e88d6b67a9e650cf694db9fb52b4dc0b0660b2 100644 (file)
--- a/Examples/pydoc1/components.py
+++ b/Examples/pydoc1/components.py
@@ -46,7 +46,6 @@ modul=Module("pycompos",components=[c1],prefix="./install",
 
 g=Generator(modul,context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/pygui1/Makefile b/Examples/pygui1/Makefile
index 3df18b819d7b2cffcc294531cdde8823c64d125a..1ea10390a0542d34202bbb1489516150999047b7 100644 (file)
--- a/Examples/pygui1/Makefile
+++ b/Examples/pygui1/Makefile
@@ -18,4 +18,4 @@
 #
 
 clean:
-       rm -rf *.pyc pycompos_SRC pycompos_SRC.bak appli appli.bak install install.bak traceExec_proc
+       rm -rf *.pyc pycompos_SRC pycompos_SRC.bak appli appli.bak install install.bak traceExec_proc pycompos_build.bak pycompos_build

diff --git a/Examples/pygui1/components.py b/Examples/pygui1/components.py
index ad7c933a6255a99a5c7c5e7020ab6350dc057763..6e2d3e250f52fcb2855003ca3e84de218edc9291 100644 (file)
--- a/Examples/pygui1/components.py
+++ b/Examples/pygui1/components.py
@@ -109,7 +109,6 @@ modul=Module("pycompos",components=[c1],prefix="./install",
 
 g=Generator(modul,context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/pyth1/Makefile b/Examples/pyth1/Makefile
index 51e2078393b55a5a35d8fbf5c9264f39ccc0af4d..0567fc07ed6d2dfa586ff17f5bef0c446f4f526e 100644 (file)
--- a/Examples/pyth1/Makefile
+++ b/Examples/pyth1/Makefile
@@ -18,4 +18,4 @@
 #
 
 clean:
-       rm -rf *.o *.so *.pyc pycompos_SRC pycompos_SRC.bak appli appli.bak install install.bak traceExec_proc
+       rm -rf *.o *.so *.pyc pycompos_SRC pycompos_SRC.bak appli appli.bak install install.bak traceExec_proc pycompos_build.bak pycompos_build

diff --git a/Examples/pyth1/components.py b/Examples/pyth1/components.py
index 3f7a743afc42bb6f11b5287f9438d745af227286..de600260a2dbc9576af04ca8d518e786dcc4b6e1 100644 (file)
--- a/Examples/pyth1/components.py
+++ b/Examples/pyth1/components.py
@@ -59,7 +59,6 @@ c1=PYComponent("compo2",services=[
 
 g=Generator(Module("pycompos",components=[c1],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/pyth2/Makefile b/Examples/pyth2/Makefile
index 5ef6962f21f10af35e4cc34d49239005a6af5861..fd8b8946a896035b5c6d82761b5b9b5ab1598372 100644 (file)
--- a/Examples/pyth2/Makefile
+++ b/Examples/pyth2/Makefile
@@ -18,4 +18,4 @@
 #
 
 clean:
-       rm -rf *.o *.so *.pyc pycompos_SRC pycompos_SRC.bak appli appli.bak install install.bak traceExec_proc compo2_inst_1
+       rm -rf *.o *.so *.pyc pycompos_SRC pycompos_SRC.bak appli appli.bak install install.bak traceExec_proc compo2_inst_1 pycompos_build.bak pycompos_build

diff --git a/Examples/pyth2/components.py b/Examples/pyth2/components.py
index 883a9378171de1311702f0b0b627d9755df1b24f..f30385a27f2384c29f20bcb876e3c67fe9216d4e 100644 (file)
--- a/Examples/pyth2/components.py
+++ b/Examples/pyth2/components.py
@@ -55,7 +55,6 @@ c1=PYComponent("compo2",services=[
 
 g=Generator(Module("pycompos",components=[c1],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()

diff --git a/Examples/types1/Makefile b/Examples/types1/Makefile
index 02ae2e7affb62e87b65b8ef67db417a67d9047d0..ebb51da6b6c60dc6ab0578ceade93921c3f7cec7 100644 (file)
--- a/Examples/types1/Makefile
+++ b/Examples/types1/Makefile
@@ -18,4 +18,4 @@
 #
 
 clean:
-       rm -rf *.o *.so mymodule_SRC mymodule_SRC.bak appli appli.bak install install.bak traceExec_*
+       rm -rf *.o *.so *.bak mymodule_SRC mymodule_build appli install traceExec_*

diff --git a/Examples/types1/components.py b/Examples/types1/components.py
index 7f9020c5cd3bb786d4787746b460d38f510b13fb..f665fad91d208eef57a63e508b24192fea588933 100644 (file)
--- a/Examples/types1/components.py
+++ b/Examples/types1/components.py
@@ -24,30 +24,6 @@ execfile("../context.py")
 
 from module_generator import Generator,Module,Service,CPPComponent,PYComponent,add_type,add_module
 
-#overload module GEOM definition
-idldefs="""
-#include "GEOM_Gen.idl"
-"""
-makefiledefs="""
-#module GEOM
-GEOM_IDL_INCLUDES = -I$(GEOM_ROOT_DIR)/idl/salome
-GEOM_INCLUDES= -I$(GEOM_ROOT_DIR)/include/salome
-GEOM_IDL_LIBS= -L$(GEOM_ROOT_DIR)/lib/salome -lSalomeIDLGEOM
-GEOM_LIBS= -L$(GEOM_ROOT_DIR)/lib/salome
-SALOME_LIBS += ${GEOM_LIBS}
-SALOME_IDL_LIBS += ${GEOM_IDL_LIBS}
-SALOME_INCLUDES += ${GEOM_INCLUDES}
-IDL_INCLUDES += ${GEOM_IDL_INCLUDES}
-"""
-configdefs="""
-if test "x${GEOM_ROOT_DIR}" != "x" && test -d ${GEOM_ROOT_DIR} ; then
-  AC_MSG_RESULT(Using GEOM installation in ${GEOM_ROOT_DIR})
-else
-  AC_MSG_ERROR([Cannot find module GEOM. Have you set GEOM_ROOT_DIR ?],1)
-fi
-"""
-add_module("GEOM",idldefs,makefiledefs,configdefs)
-
 #overload GEOM_Object definition
 add_type("GEOM_Object", "GEOM::GEOM_Object_ptr", "GEOM::GEOM_Object_out", "GEOM", "GEOM::GEOM_Object","GEOM::GEOM_Object_ptr")
 
@@ -222,7 +198,6 @@ c2=PYComponent("compo2",services=[
 
 g=Generator(Module("mymodule",components=[c1,c2],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()