More work with 'pwre ebuild'

src/tools/pwre/src/os_linux/hw_x86/import_files.mk

@@ -51,21 +51,27 @@ rt_modules = \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/ssabox/inc/pwr_ssaboxclasses.hpp \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/telemecanique/inc/pwr_telemecaniqueclasses.h \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/telemecanique/inc/pwr_telemecaniqueclasses.hpp \
-		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/exe/wb_gcg.sh
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/exe/wb_gcg.sh \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_ldh.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_vext.h
 
 
-xtt_modules = \
-		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_ldh.h \
+op_modules = \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_wnav_selformat.h \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_nav.h \
-		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_nav_gtk.h \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_pal.h \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_palfile.h \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_wccm.h \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_log.h \
-		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_log_gtk.h \
-		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_trv.h \
-		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_vext.h
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_trv.h
+
+op_gtk_modules = \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_nav_gtk.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_log_gtk.h
+
+op_motif_modules = \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_nav_motif.h
+
 
 java_modules = \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_rt.jar \
@@ -74,16 +80,23 @@ java_modules = \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_rt_client.jar
 
 
-import_files : $(rt_modules) $(xtt_modules) $(java_modules)
+import_files : $(rt_modules) $(op_modules) $(java_modules) $(op_gtk_modules)
 	@ echo ""
 
 .PHONY: rt
-.PHONY: xtt
+.PHONY: op
 .PHONY: java
 
+_gtk :
 rt : $(rt_modules)
-xtt : $(xtt_modules)
+rt_gtk :
+rt_motif :
+op : $(op_modules)
+op_gtk : $(op_gtk_modules)
+op_motif : $(op_motif_modules)
 java : $(java_modules)
+java_gtk :
+java_motif :
 
 .SUFFIXES: 
 
@@ -207,7 +220,15 @@ $(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/exe/%.sh : $(pwre_vmsinc)/exp/exe/%.sh
 	@ echo Import ${target}
 	@ cp $(source) $(target)
 
-$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_%_motif.h : $(pwre_croot)/wb/lib/wb/motif/wb_%_motif.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_%_gtk.h : $(pwre_croot)/wb/lib/wb/gtk/wb_%_gtk.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_%.h : $(pwre_croot)/wb/lib/wb/src/wb_%.h
 	@ echo Import ${target}
 	@ cp $(source) $(target)
 

src/tools/pwre/src/os_linux/pwre.pl

@@ -11,7 +11,6 @@
   "build_all_modules", "build_all_modules:usage_build_all_modules",
   "build_all_wbl", "build_all_wbl:usage_build_all_wbl",
   "ebuild",    "ebuild:usage_ebuild",
-  "build_xtt", "build_xtt:usage_build_xtt",
   "clean_exe_all", "clean_exe_all:usage_clean_exe_all",
   "method_build", "method_build:usage_method_build",
   "copy", 	"copy:usage_copy",
@@ -321,7 +320,7 @@ sub ebuild # args: pass flavour
     merge();
 
   }
-  elsif ( $pass eq "xtt" ) {
+  elsif ( $pass eq "op" ) {
     _module("xtt");
     _build("lib", "*", "src", "init copy");
     _build("lib", "*", $flavour, "copy");
@@ -335,6 +334,7 @@ sub ebuild # args: pass flavour
     _build("exe", "rt*", "src", "all");
     _build("exe", "xtt*", "src", "all");
     _build("exe", "co*", "src", "all");
+    _build("exe", "pwr*", "src", "all");
     _build("exe", "rt*", $flavour, "all");
     _build("exe", "xtt*", $flavour, "all");
     _build("exe", "co*", $flavour, "all");
@@ -345,6 +345,10 @@ sub ebuild # args: pass flavour
     merge();
     _module("profibus");
     _build("mmi", "*", "src", "copy");
+    _build("lib", "cow", "src", "init copy lib");
+    _build("lib", "cow", $flavour, "init copy lib");
+    _build("lib", "xtt", "src", "init copy lib");
+    _build("lib", "xtt", $flavour, "init copy lib");
     merge();
     _module("opc");
     _build("mmi", "*", "src", "copy");
@@ -370,46 +374,28 @@ sub ebuild # args: pass flavour
     _module("telemecanique");
     _build("mmi", "*", "src", "copy");
     merge();
+    method_build( "rt_io_comm", $flavour);
+    method_build( "rt_xtt", $flavour);
   }
 }
 
-#
-# build_xtt()
-#
-sub build_xtt # args: flavour
-{
-  my $flavour = $_[0];
-
-  _module("xtt");
-  _build("lib", "*", "src", "init copy");
-  _build("lib", "*", $flavour, "copy");
-  _build("exp", "*", "src", "init copy");
-  _build("mmi", "*", "src", "copy");
-  _build("mmi", "*", $flavour, "copy");
-  _build("exe", "*", "src", "copy");
-  _build("lib", "*", "src", "lib");
-  _build("lib", "*", $flavour, "lib");
-  _build("exp", "*", "src", "lib");
-  _build("exe", "rt*", "src", "all");
-  _build("exe", "xtt*", "src", "all");
-  _build("exe", "co*", "src", "all");
-  _build("exe", "rt*", $flavour, "all");
-  _build("exe", "xtt*", $flavour, "all");
-  _build("exe", "co*", $flavour, "all");
-  _build("exe", "pwr*", $flavour, "all");
-  merge();
-}
-
 #
 # import()
 #
 sub import ()
 {
-  my $flavour = $_[0];
+  my $flavour = $_[1];
+  if ( $_[1] eq "motif") {
+    $flavour = "motif";
+  }
+  else {
+    $flavour = "gtk";
+  }
 
   my($vmsinc) = $ENV{"pwre_vmsinc"};
   if ( $vmsinc ne "" ) {
-    copy();
+
+    copy( $_[0], $flavour);
 
     _module("rt");
     merge();
@@ -872,14 +858,24 @@ sub copy ()
 
   my($vmsinc) = $ENV{"pwre_vmsinc"};
   my($bindir) = $ENV{"pwre_bin"} . "/" . $ENV{"pwre_hw"};
+  my($docroot) = $ENV{"pwre_broot"} . "/" . $ENV{"pwre_os"} . "/" . $ENV{"pwre_hw"} . "/exp/doc/";
 
   printf("--\n");
   printf("-- Copy file from Import root\n");
   printf("-- Import root: %s\n", $vmsinc);
   printf("--\n");
   
-  my($cmd) = "make -f $bindir/import_files.mk" . $_[0]; 
+  if ( $_[0] eq "doc" ) {
+    my($cmd) = "cp -r " . $vmsinc . "/exp/doc/* " . $docroot; 
+    system("$cmd");
+  }
+  else {
+    my($cmd) = "make -f $bindir/import_files.mk" . " " . $_[0]; 
+    system("$cmd");
+
+    my($cmd) = "make -f $bindir/import_files.mk" . " " . $_[0] . "_" . $_[1]; 
     system("$cmd");
+  }
 }
 
 #
@@ -1393,13 +1389,7 @@ sub usage_build_all_wbl ()
 sub usage_ebuild ()
 {
   printf("++\n");
-  printf("++ ebuild                        : Builds rt module\n");
-}
-
-sub usage_build_xtt ()
-{
-  printf("++\n");
-  printf("++ build_xtt                      : Builds xtt module\n");
+  printf("++ ebuild 'block' 'flavour'       : Builds rt or op block\n");
 }
 
 sub usage_clean_exe_all ()
@@ -1459,7 +1449,7 @@ sub usage_init ()
 sub usage_import ()
 {
   printf("++\n");
-  printf("++ import                        : Import files from import root\n");
+  printf("++ import 'block' ['flavour']    : Import files from import root, block rt, op, java, doc\n");
 }
 
 sub usage_module ()