Import of dbs-files to get same loadfile version on different platforms

src/tools/pwre/src/os_linux/hw_x86/import_dbs.sh

+#!/bin/bash
+#
+# Import loadfile
+# Arg1 import base root
+# Arg2 target base root
+#
+tst=`eval echo $1 | grep :`
+if [ -z $tst ]; then
+  # Local import root, use cp
+  copy="cp"
+else
+  # Remote import root, use scp
+  copy="scp"
+fi
+
+$copy $1/exp/load/*.dbs $2/exp/load/
+cp -p $2/exp/load/pwrs.dbs $2/rt/load/
+cp -p $2/exp/load/pwrb.dbs $2/rt/load/
+cp -p $2/exp/load/rt.dbs $2/rt/load/
+cp -p $2/exp/load/basecomponent.dbs $2/bcomp/load/
+cp -p $2/exp/load/nmps.dbs $2/nmps/load/
+cp -p $2/exp/load/opc.dbs $2/opc/load/
+cp -p $2/exp/load/profibus.dbs $2/profibus/load/
+cp -p $2/exp/load/otherio.dbs $2/otherio/load/
+cp -p $2/exp/load/remote.dbs $2/remote/load/
+cp -p $2/exp/load/tlog.dbs $2/tlog/load/
+cp -p $2/exp/load/abb.dbs $2/abb/load/
+cp -p $2/exp/load/inor.dbs $2/inor/load/
+cp -p $2/exp/load/klocknermoeller.dbs $2/klocknermoeller/load/
+cp -p $2/exp/load/othermanufacturer.dbs $2/othermanu/load/
+cp -p $2/exp/load/siemens.dbs $2/siemens/load/
+cp -p $2/exp/load/ssabox.dbs $2/ssabox/load/
+cp -p $2/exp/load/telemecanique.dbs $2/telemecanique/load/

src/tools/pwre/src/os_linux/hw_x86_64/import_dbs.sh

+#!/bin/bash
+#
+# Import loadfile
+# Arg1 import base root
+# Arg2 target base root
+#
+tst=`eval echo $1 | grep :`
+if [ -z $tst ]; then
+  # Local import root, use cp
+  copy="cp"
+else
+  # Remote import root, use scp
+  copy="scp"
+fi
+
+$copy $1/exp/load/*.dbs $2/exp/load/
+cp -p $2/exp/load/pwrs.dbs $2/rt/load/
+cp -p $2/exp/load/pwrb.dbs $2/rt/load/
+cp -p $2/exp/load/rt.dbs $2/rt/load/
+cp -p $2/exp/load/basecomponent.dbs $2/bcomp/load/
+cp -p $2/exp/load/nmps.dbs $2/nmps/load/
+cp -p $2/exp/load/opc.dbs $2/opc/load/
+cp -p $2/exp/load/profibus.dbs $2/profibus/load/
+cp -p $2/exp/load/otherio.dbs $2/otherio/load/
+cp -p $2/exp/load/remote.dbs $2/remote/load/
+cp -p $2/exp/load/tlog.dbs $2/tlog/load/
+cp -p $2/exp/load/abb.dbs $2/abb/load/
+cp -p $2/exp/load/inor.dbs $2/inor/load/
+cp -p $2/exp/load/klocknermoeller.dbs $2/klocknermoeller/load/
+cp -p $2/exp/load/othermanufacturer.dbs $2/othermanu/load/
+cp -p $2/exp/load/siemens.dbs $2/siemens/load/
+cp -p $2/exp/load/ssabox.dbs $2/ssabox/load/
+cp -p $2/exp/load/telemecanique.dbs $2/telemecanique/load/

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

+import_top : import_files
+
+source  	= $<
+target  	= $@
+
+rt_modules = \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/pwrs.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/pwrb.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/rt.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/basecomponent.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/nmps.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/opc.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/profibus.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/otherio.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/remote.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/tlog.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/abb.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/inor.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/klocknermoeller.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/othermanufacturer.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/siemens.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/ssabox.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/telemecanique.dbs \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/rt/inc/pwr_systemclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/rt/inc/pwr_systemclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/rt/inc/pwr_baseclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/rt/inc/pwr_baseclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/bcomp/inc/pwr_basecomponentclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/bcomp/inc/pwr_basecomponentclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/nmps/inc/pwr_nmpsclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/nmps/inc/pwr_nmpsclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/opc/inc/pwr_opcclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/opc/inc/pwr_opcclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/profibus/inc/pwr_profibusclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/profibus/inc/pwr_profibusclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/otherio/inc/pwr_otherioclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/otherio/inc/pwr_otherioclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/remote/inc/pwr_remoteclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/remote/inc/pwr_remoteclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/abb/inc/pwr_abbclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/abb/inc/pwr_abbclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/inor/inc/pwr_inorclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/inor/inc/pwr_inorclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/klocknermoeller/inc/pwr_klocknermoellerclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/klocknermoeller/inc/pwr_klocknermoellerclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/othermanu/inc/pwr_othermanufacturerclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/othermanu/inc/pwr_othermanufacturerclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/siemens/inc/pwr_siemensclasses.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/siemens/inc/pwr_siemensclasses.hpp \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/ssabox/inc/pwr_ssaboxclasses.h \
+		$(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/inc/wb_ldh.h \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/inc/wb_vext.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_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_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 \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_jop.jar \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_jopc.jar \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_rt_client.jar
+
+
+import_files : $(rt_modules) $(op_modules) $(java_modules) $(op_gtk_modules)
+	@ echo ""
+
+.PHONY: rt
+.PHONY: op
+.PHONY: java
+
+_gtk :
+rt : $(rt_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: 
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/load/%.dbs : $(pwre_vmsinc)/exp/load/%.dbs
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/rt/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/rt/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/bcomp/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/bcomp/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/nmps/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/nmps/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/opc/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/opc/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/profibus/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/profibus/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/otherio/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/otherio/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/remote/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/remote/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/abb/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/abb/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/inor/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/inor/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/klocknermoeller/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/klocknermoeller/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/othermanu/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/othermanu/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/siemens/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/siemens/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/ssabox/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/ssabox/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/telemecanique/inc/%.h : $(pwre_vmsinc)/exp/inc/%.h
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/telemecanique/inc/%.hpp : $(pwre_vmsinc)/exp/inc/%.hpp
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+
+$(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/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)
+
+$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/%.jar : $(pwre_vmsinc)/exp/lib/%.jar
+	@ echo Import ${target}
+	@ cp $(source) $(target)
+

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

@@ -971,6 +971,7 @@ 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/";
+  my($exproot) = $ENV{"pwre_broot"} . "/" . $ENV{"pwre_os"} . "/" . $ENV{"pwre_hw"};
 
   printf("--\n");
   printf("-- Copy file from Import root\n");
@@ -981,6 +982,10 @@ sub copy ()
     my($cmd) = "cp -r " . $vmsinc . "/exp/doc/* " . $docroot; 
     system("$cmd");
   }
+  elsif ( $_[0] eq "dbs" ) {
+    my($cmd) = "$bindir/import_dbs.sh " . $vmsinc . " " . $exproot; 
+    system("$cmd");
+  }
   else {
     my($cmd) = "make -f $bindir/import_files.mk" . " " . $_[0]; 
     system("$cmd");
@@ -1414,7 +1419,7 @@ sub get_vars ()
     $desc = $_[6];
   }
 
-  $varstr = join(":", ($sroot, $vmsinc, $broot, $btype, $os, $hw, $desc));
+  $varstr = join(";", ($sroot, $vmsinc, $broot, $btype, $os, $hw, $desc));
 
 }
 
@@ -1435,7 +1440,7 @@ sub get_var()
 sub read_vars ()
 {
   $varstr = $envdb{$label};
-  ($sroot, $vmsinc, $broot, $btype, $os, $hw, $desc)  =  split(/:/, $varstr);
+  ($sroot, $vmsinc, $broot, $btype, $os, $hw, $desc)  =  split(/;/, $varstr);
   @vars = ($sroot, $vmsinc, $broot, $btype, $os, $hw, $desc);
 }
 
@@ -1561,7 +1566,7 @@ sub usage_init ()
 sub usage_import ()
 {
   printf("++\n");
-  printf("++ import 'block' ['flavour']    : Import files from import root, block rt, op, java, doc\n");
+  printf("++ import 'block' ['flavour']    : Import files from import root, block dbs, rt, op, java, doc\n");
 }
 
 sub usage_module ()