Merge branch 'master' of 62.20.65.89:/data1/git/pwr

bcomp/changelog.txt

@@ -21,3 +21,4 @@
 100216 cs  bcomp      Backup added to BasePositSensor.
 100304 cs  bcomp      Off2 and Off3 inputs added to BaseFcPPO3Fo and BaseFcPPO5Fc.
 100309 cs  bcomp      ForceMan input added to CompModeDFo and CompModeD2Fo.
+100326 cs  bcomp      BaseContactor, pulsed start/stop implemented.
\ No newline at end of file

bcomp/lib/rt/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif
+
+-include ../../special.mk
+-include ../special.mk
+-include special.mk

bcomp/wbl/bcomp/src/os_linux/hw_x86/special.mk

@@ -5,17 +5,17 @@ exe :  $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_h.html \
 
 $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_h.html : $(inc_dir)/pwr_basecomponentclasses.h
 	@ echo "Generating html files for struct sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/pwr_basecomponentclasses_h.html : $(inc_dir)/pwr_basecomponentclasses.h
 	@ echo "Generating html files for struct en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_hpp.html : $(inc_dir)/pwr_basecomponentclasses.hpp
 	@ echo "Generating html files for struct sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/pwr_basecomponentclasses_hpp.html : $(inc_dir)/pwr_basecomponentclasses.hpp
 	@ echo "Generating html files for struct en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 

bcomp/wbl/bcomp/src/os_linux/hw_x86_64/special.mk

@@ -5,17 +5,17 @@ exe :  $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_h.html \
 
 $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_h.html : $(inc_dir)/pwr_basecomponentclasses.h
 	@ echo "Generating html files for struct sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/pwr_basecomponentclasses_h.html : $(inc_dir)/pwr_basecomponentclasses.h
 	@ echo "Generating html files for struct en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_hpp.html : $(inc_dir)/pwr_basecomponentclasses.hpp
 	@ echo "Generating html files for struct sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/pwr_basecomponentclasses_hpp.html : $(inc_dir)/pwr_basecomponentclasses.hpp
 	@ echo "Generating html files for struct en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 

bcomp/wbl/bcomp/src/os_macos/hw_x86_64/special.mk

@@ -5,17 +5,17 @@ exe :  $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_h.html \
 
 $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_h.html : $(inc_dir)/pwr_basecomponentclasses.h
 	@ echo "Generating html files for struct sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/pwr_basecomponentclasses_h.html : $(inc_dir)/pwr_basecomponentclasses.h
 	@ echo "Generating html files for struct en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/pwr_basecomponentclasses_hpp.html : $(inc_dir)/pwr_basecomponentclasses.hpp
 	@ echo "Generating html files for struct sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/pwr_basecomponentclasses_hpp.html : $(inc_dir)/pwr_basecomponentclasses.hpp
 	@ echo "Generating html files for struct en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 

changelog.txt

@@ -6,3 +6,4 @@
 080428 cs  .         Release 4.5.0-5.
 081205 cs  .         Release 4.6.0-4.
 090529 cs  .         Release 4.6.1-1.
+100329 cs  .         Release 4.7.0-1.

java/exe/jpwr_rt_gdh/src/os_linux/hw_arm/jpwr_rt_hist.cpp

+/* 
+ * Proview   $Id: jpwr_rt_hist.cpp,v 1.6 2007-02-06 15:12:36 claes Exp $
+ * Copyright (C) 2005 SSAB Oxelsund AB.
+ *
+ * This program is free software; you can redistribute it and/or 
+ * modify it under the terms of the GNU General Public License as 
+ * published by the Free Software Foundation, either version 2 of 
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License 
+ * along with the program, if not, write to the Free Software 
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+using namespace std;
+
+#include <string>
+#include <string.h>
+#include <stdio.h>
+#include "jpwr_rt_hist.h"
+
+JNIEXPORT void JNICALL Java_jpwr_rt_Hist_initHistIDs
+  (JNIEnv *env, jclass cls)
+{
+}
+
+
+
+/*
+ * Class:     jpwr_rt_Mh
+ * Method:    getHistList
+ * Signature: (Ljava/lang/String;Ljava/lang/String;ZZZZZZZZLjava/lang/String;Ljava/lang/String;)[Ljpwr/rt/MhrEvent;
+ */
+JNIEXPORT jobjectArray JNICALL Java_jpwr_rt_Hist_getHistList
+  (JNIEnv *env, jclass obj, jstring jstartTime, jstring jstopTime, jboolean jtypeAlarm, jboolean jtypeInfo, jboolean jtypeReturn, jboolean jtypeAck, jboolean jprioA, jboolean jprioB, jboolean jprioC, jboolean jprioD, jstring jname, jstring jtext)
+{
+  return (jobjectArray)NULL;
+}
+

java/exe/jpwr_rt_gdh/src/os_linux/hw_arm/link_rule.mk

+ifndef link_rule_mk
+link_rule_mk := 1
+
+link =	$(ldxx) -shared -DHW_ARM -DOS_LINUX \
+	-L${pwr_elib} \
+	-L${pwr_lib} \
+	${pwre_broot}/${pwre_target}/bld/lib/co/*.o \
+	$(rt_msg_eobjs) \
+	${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_qcom.o \
+	${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_op.o \
+	${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_wb.o \
+	${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_ge.o \
+	${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_flow.o \
+	${pwre_broot}/${pwre_target}/bld/lib/msg_dummy/msg_dummy_pwrp.o \
+	${pwre_broot}/${pwre_target}/bld/lib/rt/*.o \
+	${pwre_broot}/${pwre_target}/exp/obj/rt_io_user.o \
+	${pwre_broot}/${pwre_target}/exp/obj/dtt_rttsys.o \
+	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/io_ssab_dummy.o \
+	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/rtt_dummy.o \
+	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/jpwr_rt_qcom.o \
+	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/jpwr_rt_Errh.o \
+	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/jpwr_rt_rtsecurity.o \
+	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/jpwr_rt_mh.o \
+	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/jpwr_rt_hist.o \
+	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/jpwr_rt_gdh.o \
+	${pwre_broot}/${pwre_target}/bld/lib/statussrv/*.o \
+	${pwre_broot}/${pwre_target}/exp/obj/stdsoap2.o \
+	-o ${pwr_exe}/libjpwr_rt_gdh.so -lm -lpthread -lrt -lcrypt -lpwr_dtt -lpwr_usbio_dummy
+
+#	-lSM -lICE -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
+#	${pwre_broot}/${pwre_target}/bld/lib/flow/*.o \
+#	${pwre_broot}/${pwre_target}/bld/lib/cow/*.o \
+#	`pkg-config --libs gtk+-2.0` \
+#	-L/usr/X11R6/lib \
+
+endif
+
+
+
+
+
+
+
+
+
+
+

java/exe/jpwr_rt_gdh/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif
+
+-include ../../special.mk
+-include ../special.mk
+-include special.mk

java/exe/jpwr_rt_gdh/src/os_linux/link_rule.mk

 ifndef link_rule_mk
 link_rule_mk := 1
 
-link =	g++ -shared -DHW_X86 -DOS_LINUX \
+link =	$(ldxx) -shared -DHW_X86 -DOS_LINUX \
 	-L${pwr_elib} \
 	-L${pwr_lib} \
 	${pwre_broot}/${pwre_target}/bld/lib/co/*.o \

nmps/exe/rs_nmps_bck/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif

nmps/exe/rs_nmps_trans/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif

nmps/lib/nmps/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif
+
+-include ../../special.mk
+-include ../special.mk
+-include special.mk

nmps/lib/nmps/src/os_linux/hw_arm/special.mk

+copy : $(doc_dir)/sv_se/orm/nmps_plc_c.html \
+       $(doc_dir)/en_us/orm/nmps_plc_c.html \
+       $(doc_dir)/sv_se/orm/nmps_plc_display_c.html \
+       $(doc_dir)/en_us/orm/nmps_plc_display_c.html \
+       $(doc_dir)/sv_se/orm/nmps_plc_runtime_c.html \
+       $(doc_dir)/en_us/orm/nmps_plc_runtime_c.html \
+       $(doc_dir)/sv_se/orm/nmps_plc_macro_h.html \
+       $(doc_dir)/en_us/orm/nmps_plc_macro_h.html \
+
+$(doc_dir)/sv_se/orm/nmps_plc_c.html : ../../nmps_plc.c
+	@ echo "Generating html files for nmps_plc sv_se..."
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
+
+$(doc_dir)/en_us/orm/nmps_plc_c.html : ../../nmps_plc.c
+	@ echo "Generating html files for nmps_plc en_us..."
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
+
+$(doc_dir)/sv_se/orm/nmps_plc_display_c.html : ../../nmps_plc_display.c
+	@ echo "Generating html files for nmps_plc_display sv_se..."
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
+
+$(doc_dir)/en_us/orm/nmps_plc_display_c.html : ../../nmps_plc_display.c
+	@ echo "Generating html files for nmps_plc_display en_us..."
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
+
+$(doc_dir)/sv_se/orm/nmps_plc_runtime_c.html : ../../nmps_plc_runtime.c
+	@ echo "Generating html files for nmps_plc_runtime sv_se..."
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
+
+$(doc_dir)/en_us/orm/nmps_plc_runtime_c.html : ../../nmps_plc_runtime.c
+	@ echo "Generating html files for nmps_plc_runtime en_us..."
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
+
+$(doc_dir)/sv_se/orm/nmps_plc_macro_h.html : ../../nmps_plc_macro.h
+	@ echo "Generating html files for nmps_plc_macro sv_se..."
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
+
+$(doc_dir)/en_us/orm/nmps_plc_macro_h.html : ../../nmps_plc_macro.h
+	@ echo "Generating html files for nmps_plc_macro en_us..."
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
+
+

nmps/lib/nmps/src/os_linux/hw_x86/special.mk

@@ -9,34 +9,34 @@ copy : $(doc_dir)/sv_se/orm/nmps_plc_c.html \
 
 $(doc_dir)/sv_se/orm/nmps_plc_c.html : ../../nmps_plc.c
 	@ echo "Generating html files for nmps_plc sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_c.html : ../../nmps_plc.c
 	@ echo "Generating html files for nmps_plc en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/nmps_plc_display_c.html : ../../nmps_plc_display.c
 	@ echo "Generating html files for nmps_plc_display sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_display_c.html : ../../nmps_plc_display.c
 	@ echo "Generating html files for nmps_plc_display en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/nmps_plc_runtime_c.html : ../../nmps_plc_runtime.c
 	@ echo "Generating html files for nmps_plc_runtime sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_runtime_c.html : ../../nmps_plc_runtime.c
 	@ echo "Generating html files for nmps_plc_runtime en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/nmps_plc_macro_h.html : ../../nmps_plc_macro.h
 	@ echo "Generating html files for nmps_plc_macro sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_macro_h.html : ../../nmps_plc_macro.h
 	@ echo "Generating html files for nmps_plc_macro en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 

nmps/lib/nmps/src/os_linux/hw_x86_64/special.mk

@@ -9,34 +9,34 @@ copy : $(doc_dir)/sv_se/orm/nmps_plc_c.html \
 
 $(doc_dir)/sv_se/orm/nmps_plc_c.html : ../../nmps_plc.c
 	@ echo "Generating html files for nmps_plc sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_c.html : ../../nmps_plc.c
 	@ echo "Generating html files for nmps_plc en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/nmps_plc_display_c.html : ../../nmps_plc_display.c
 	@ echo "Generating html files for nmps_plc_display sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_display_c.html : ../../nmps_plc_display.c
 	@ echo "Generating html files for nmps_plc_display en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/nmps_plc_runtime_c.html : ../../nmps_plc_runtime.c
 	@ echo "Generating html files for nmps_plc_runtime sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_runtime_c.html : ../../nmps_plc_runtime.c
 	@ echo "Generating html files for nmps_plc_runtime en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/nmps_plc_macro_h.html : ../../nmps_plc_macro.h
 	@ echo "Generating html files for nmps_plc_macro sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_macro_h.html : ../../nmps_plc_macro.h
 	@ echo "Generating html files for nmps_plc_macro en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 

nmps/lib/nmps/src/os_macos/hw_x86_64/special.mk

@@ -9,34 +9,34 @@ copy : $(doc_dir)/sv_se/orm/nmps_plc_c.html \
 
 $(doc_dir)/sv_se/orm/nmps_plc_c.html : ../../nmps_plc.c
 	@ echo "Generating html files for nmps_plc sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_c.html : ../../nmps_plc.c
 	@ echo "Generating html files for nmps_plc en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/nmps_plc_display_c.html : ../../nmps_plc_display.c
 	@ echo "Generating html files for nmps_plc_display sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_display_c.html : ../../nmps_plc_display.c
 	@ echo "Generating html files for nmps_plc_display en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/nmps_plc_runtime_c.html : ../../nmps_plc_runtime.c
 	@ echo "Generating html files for nmps_plc_runtime sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_runtime_c.html : ../../nmps_plc_runtime.c
 	@ echo "Generating html files for nmps_plc_runtime en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 $(doc_dir)/sv_se/orm/nmps_plc_macro_h.html : ../../nmps_plc_macro.h
 	@ echo "Generating html files for nmps_plc_macro sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(source)"
 
 $(doc_dir)/en_us/orm/nmps_plc_macro_h.html : ../../nmps_plc_macro.h
 	@ echo "Generating html files for nmps_plc_macro en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(source)"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(source)"
 
 

nmps/wbl/nmps/src/os_linux/hw_x86/makefile

@@ -52,40 +52,40 @@ $(load_dir)/nmps.dbs :
 
 $(inc_dir)/pwr_nmpsclasses.h :
 	@ echo "Generating struct files for nmps classes..."
-	@ co_convert -so -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -so -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(inc_dir)/pwr_nmpsclasses.hpp :
 	@ echo "Generating hpp files for nmps classes..."
-	@ co_convert -po -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -po -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(doc_dir)/en_us/orm/nmps_allclasses.html :
 	@ echo "Generating html files for nmps classes en_us..."
-	@ co_convert -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.h
-	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.hpp
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.h
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.hpp
 	@ echo "Generating html files for nmps code en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
 	@ echo "Generating html files for nmps classes sv_se..."
-	@ co_convert -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.h
-	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.hpp
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.h
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.hpp
 	@ echo "Generating html files for nmps code sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
 	@ echo "Generating postscript file for nmps classes..."
-	@ co_convert -q -d $(doc_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
-	@ co_convert -q -l sv_se -d $(doc_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -q -d $(doc_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -q -l sv_se -d $(doc_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(exe_dir)/en_us/nmps_xtthelp.dat :
 	@ echo "Generating xtt help files for nmps classes en_us"
-	@ co_convert -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ $(co_convert) -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
 
 $(exe_dir)/sv_se/nmps_xtthelp.dat :
 	@ echo "Generating xtt help files for nmps classes sv_se"
-	@ co_convert -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
 
 clean_wbl :
 	@ if [ -e $(load_dir)/nmps.dbs ]; then \

nmps/wbl/nmps/src/os_linux/hw_x86_64/makefile

@@ -52,40 +52,40 @@ $(load_dir)/nmps.dbs :
 
 $(inc_dir)/pwr_nmpsclasses.h :
 	@ echo "Generating struct files for nmps classes..."
-	@ co_convert -so -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -so -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(inc_dir)/pwr_nmpsclasses.hpp :
 	@ echo "Generating hpp files for nmps classes..."
-	@ co_convert -po -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -po -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(doc_dir)/en_us/orm/nmps_allclasses.html :
 	@ echo "Generating html files for nmps classes en_us..."
-	@ co_convert -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.h
-	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.hpp
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.h
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.hpp
 	@ echo "Generating html files for nmps code en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
 	@ echo "Generating html files for nmps classes sv_se..."
-	@ co_convert -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.h
-	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.hpp
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.h
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.hpp
 	@ echo "Generating html files for nmps code sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
 	@ echo "Generating postscript file for nmps classes..."
-	@ co_convert -q -d $(doc_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
-	@ co_convert -q -l sv_se -d $(doc_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -q -d $(doc_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -q -l sv_se -d $(doc_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(exe_dir)/en_us/nmps_xtthelp.dat :
 	@ echo "Generating xtt help files for nmps classes en_us"
-	@ co_convert -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ $(co_convert) -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
 
 $(exe_dir)/sv_se/nmps_xtthelp.dat :
 	@ echo "Generating xtt help files for nmps classes sv_se"
-	@ co_convert -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
 
 clean_wbl :
 	@ if [ -e $(load_dir)/nmps.dbs ]; then \

nmps/wbl/nmps/src/os_macos/hw_x86_64/makefile

@@ -52,40 +52,40 @@ $(load_dir)/nmps.dbs :
 
 $(inc_dir)/pwr_nmpsclasses.h :
 	@ echo "Generating struct files for nmps classes..."
-	@ co_convert -so -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -so -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(inc_dir)/pwr_nmpsclasses.hpp :
 	@ echo "Generating hpp files for nmps classes..."
-	@ co_convert -po -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -po -d $(inc_dir) "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(doc_dir)/en_us/orm/nmps_allclasses.html :
 	@ echo "Generating html files for nmps classes en_us..."
-	@ co_convert -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -w -d $(doc_dir)/en_us/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.h
-	@ co_convert -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.hpp
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.h
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_nmpsclasses.hpp
 	@ echo "Generating html files for nmps code en_us..."
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
-	@ co_convert -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
+	@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
 	@ echo "Generating html files for nmps classes sv_se..."
-	@ co_convert -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/nmps/src/cnv_setup.dat "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 	@ echo "Generating html files for nmps structs sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.h
-	@ co_convert -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.hpp
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.h
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_nmpsclasses.hpp
 	@ echo "Generating html files for nmps code sv_se..."
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
-	@ co_convert -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc_macro.h"
+	@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/nmps/src/nmps_plc*.c"
 	@ echo "Generating postscript file for nmps classes..."
-	@ co_convert -q -d $(doc_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
-	@ co_convert -q -l sv_se -d $(doc_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -q -d $(doc_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
+	@ $(co_convert) -q -l sv_se -d $(doc_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_*.wb_load"
 
 $(exe_dir)/en_us/nmps_xtthelp.dat :
 	@ echo "Generating xtt help files for nmps classes en_us"
-	@ co_convert -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ $(co_convert) -x -d $(exe_dir)/en_us "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
 
 $(exe_dir)/sv_se/nmps_xtthelp.dat :
 	@ echo "Generating xtt help files for nmps classes sv_se"
-	@ co_convert -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
+	@ $(co_convert) -x -l sv_se -d $(exe_dir)/sv_se "$(pwre_sroot)/wbl/nmps/src/nmps_c_*.wb_load"
 
 clean_wbl :
 	@ if [ -e $(load_dir)/nmps.dbs ]; then \

opc/exe/opc_provider/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif
+
+-include ../../special.mk
+-include ../special.mk
+-include special.mk

opc/exe/opc_server/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif
+
+-include ../../special.mk
+-include ../special.mk
+-include special.mk

opc/lib/opc/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif
+
+-include ../../special.mk
+-include ../special.mk
+-include special.mk

opc/lib/opc/src/os_linux/hw_arm/special.mk

+ifndef variables_mk
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
+endif
+ifndef variables_mk
+ include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
+endif
+
+
+export_cpp = $(bld_dir)/stdsoap2.o
+export_h = $(inc_dir)/stdsoap2.h $(inc_dir)/Service.nsmap
+
+lib : $(export_lib) export_lib_local
+
+export_lib_local : $(export_cpp) $(export_h)
+	@ $(ar) -r $(export_lib) $(export_cpp)
+
+
+$(bld_dir)/stdsoap2.o : ../../stdsoap2.cpp
+
+$(inc_dir)/stdsoap2.h : ../../stdsoap2.h
+
+$(inc_dir)/Service.nsmap : ../../Service.nsmap
+	@ echo "Export $(source)"
+	@ $(cp) $(cpflags) $(source) $(target)

otherio/lib/usbio_dummy/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif
+
+-include ../../special.mk
+-include ../special.mk
+-include special.mk

othermanu/wbl/mcomp/src/othermanufacturer.wb_load

@@ -14476,10 +14476,11 @@ else
         EndObject
       EndObject
       Object Template Eurotherm_TC3001Aggr 2157150208 01-JAN-1970 01:00:00.00
-        Body RtBody 16-OCT-2007 11:31:05.55
+        Body RtBody 23-MAR-2010 16:49:08.68
           Attr CircuitBreaker.AlarmText = "Circuit breaker tripped"
           Attr Contactor.Super.Specification = "Contactor"
           Attr Contactor.Order.Description = "Energize contactor"
+          Attr Contactor.DisableOffControl = 1
           Attr Contactor.Feedback.Description = "Contactor is energized"
           Attr Contactor.FbTimeLimit = 1.000000e+00
           Attr Contactor.AlarmText = "Contactor feedback lost"
@@ -21647,9 +21648,10 @@ Eurotherm TC3001 Aggregate
         EndObject
       EndObject
       Object Template Omron_Contactor_J7KN 2148761600 06-OCT-2005 09:28:20.00
-        Body RtBody 06-OCT-2005 09:46:18.17
+        Body RtBody 23-MAR-2010 16:48:42.31
           Attr Super.Super.Specification = "Omron motor contactor J7KN"
           Attr Super.Super.DataSheet = "$pwr_lang/dsh/omron_contactor_j7kn.pdf"
+          Attr Super.DisableOffControl = 1
           Attr Super.FbTimeLimit = 1.000000e+00
           Attr Super.AlarmText = "Feedback contactor lost"
         EndBody

profibus/exp/rt/src/os_linux/hw_x86/makefile

@@ -86,7 +86,7 @@ $(exe_dir)/%.wav : ../../%.wav
 $(exe_dir)/profibus_xtthelp.dat : profibus_xtthelp.dat
 	@ echo "Copying $(source)"
 	@ $(cp) $(cpflags) $(source) $(target)
-	@ co_convert -t -d $(pwr_doc)/help $(source)
+	@ $(co_convert) -t -d $(pwr_doc)/help $(source)
 
 $(exe_dir)/%.gif : ../../%.gif
 	@ echo "Copying $(source).gif exe"

profibus/exp/rt/src/os_linux/hw_x86_64/makefile

@@ -86,7 +86,7 @@ $(exe_dir)/%.wav : ../../%.wav
 $(exe_dir)/profibus_xtthelp.dat : profibus_xtthelp.dat
 	@ echo "Copying $(source)"
 	@ $(cp) $(cpflags) $(source) $(target)
-	@ co_convert -t -d $(pwr_doc)/help $(source)
+	@ $(co_convert) -t -d $(pwr_doc)/help $(source)
 
 $(exe_dir)/%.gif : ../../%.gif
 	@ echo "Copying $(source).gif exe"

profibus/exp/rt/src/os_macos/hw_x86_64/makefile

@@ -86,7 +86,7 @@ $(exe_dir)/%.wav : ../../%.wav
 $(exe_dir)/profibus_xtthelp.dat : profibus_xtthelp.dat
 	@ echo "Copying $(source)"
 	@ $(cp) $(cpflags) $(source) $(target)
-	@ co_convert -t -d $(pwr_doc)/help $(source)
+	@ $(co_convert) -t -d $(pwr_doc)/help $(source)
 
 $(exe_dir)/%.gif : ../../%.gif
 	@ echo "Copying $(source).gif exe"

remote/exe/remote_pvd_pwrcli/src/os_linux/hw_arm/makefile

+include $(pwre_dir_symbols)
+
+
+-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/$(type_name)_generic.mk
+
+ifeq ($($(type_name)_generic_mk),)
+ -include $(pwre_kroot)/tools/bld/src/$(os_name)/$(type_name)_generic.mk
+endif
+
+ifeq ($($(type_name)_generic_mk),)
+ include $(pwre_kroot)/tools/bld/src/$(type_name)_generic.mk
+endif

src/doc/dox/src/os_linux/hw_x86/makefile

@@ -40,7 +40,7 @@ $(clean_html) : clean_%.html : %.html
 
 $(doc_dir)/dox/index.html : ../../doxygen.dx
 	@ echo "doxygen documentation $(source) $(target)"
-	@ doxygen
+	@ doxygen 2> /dev/null