Commit cb2469f5 authored by Christoffer Ackelman's avatar Christoffer Ackelman

Wbl files are now compiled in parallel.

parent ef36eef2
......@@ -1460,7 +1460,7 @@ sub _build () # args: branch, subbranch, flavour, phase
if ($hw eq "x86" && $real_hw eq "x86_64") {
$ENV{"cross_compile"} = "-m32";
}
if ($branch eq "lib" || ($branch eq "exe" && $flavour ne "src")) {
if ($branch eq "lib" || $branch eq "wbl" || ($branch eq "exe" && $flavour ne "src")) {
# All libraries and GUI-exe files can be compiled in parallel
system("make -j @_") && exit 1;
} else {
......
......@@ -39,6 +39,21 @@ copy : $(inc_dir)/pwr_baseclasses.h \
lib : $(load_dir)/pwrb.dbs | silent
exe : $(doc_dir)/en_us/orm/pwrb_allclasses.html \
$(doc_dir)/sv_se/orm/pwrb_allclasses.html \
$(doc_dir)/en_us/orm/pwrb_baseclasses_h.html \
$(doc_dir)/sv_se/orm/pwrb_baseclasses_h.html \
$(doc_dir)/en_us/orm/pwrb_baseclasses_hpp.html \
$(doc_dir)/sv_se/orm/pwrb_baseclasses_hpp.html \
$(doc_dir)/en_us/orm/rt_plc_macro_%_h.html \
$(doc_dir)/sv_se/orm/rt_plc_macro_%_h.html \
$(doc_dir)/en_us/orm/rt_plc_%_c.html \
$(doc_dir)/sv_se/orm/rt_plc_%_c.html \
$(doc_dir)/en_us/orm/rt_c_%_c.html \
$(doc_dir)/sv_se/orm/rt_c_%_c.html \
$(doc_dir)/en_us/orm/rt_csup_c.html \
$(doc_dir)/sv_se/orm/rt_csup_c.html \
$(doc_dir)/en_us/pwrb.ps \
$(doc_dir)/sv_se/pwrb.ps \
$(exe_dir)/en_us/pwrb_xtthelp.dat \
$(exe_dir)/sv_se/pwrb_xtthelp.dat \
| silent
......@@ -68,26 +83,65 @@ $(inc_dir)/pwr_baseclasses.hpp :
$(doc_dir)/en_us/orm/pwrb_allclasses.html :
@ echo "Generating html files for pwrb classes en_us..."
@ $(co_convert) -w -d $(doc_dir)/en_us/orm -y $(bld_dir)/pwrb.d_html_wbl -g $(pwre_sroot)/wbl/pwrb/src/cnv_setup.dat "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
$(doc_dir)/en_us/orm/pwrb_baseclasses_h.html :
@ echo "Generating html files for pwrb structs en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_baseclasses.h
$(doc_dir)/en_us/orm/pwrb_baseclasses_hpp.html :
@ echo "Generating html files for pwrb structs en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_baseclasses.hpp
$(doc_dir)/en_us/orm/rt_plc_macro_%_h.html :
@ echo "Generating html files for pwrb code en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/rt/src/rt_plc_macro_*.h"
$(doc_dir)/en_us/orm/rt_plc_%_c.html :
@ echo "Generating html files for pwrb code en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/rt/src/rt_plc_*.c"
$(doc_dir)/en_us/orm/rt_c_%_c.html :
@ echo "Generating html files for pwrb code en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/rt/src/rt_c_*.c"
$(doc_dir)/en_us/orm/rt_csup_c.html :
@ echo "Generating html files for pwrb code en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm "$(pwre_sroot)/lib/rt/src/rt_csup.c"
$(doc_dir)/sv_se/orm/pwrb_allclasses.html :
@ echo "Generating html files for pwrb classes sv_se..."
@ $(co_convert) -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/pwrb/src/cnv_setup.dat "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
$(doc_dir)/sv_se/orm/pwrb_baseclasses_h.html :
@ echo "Generating html files for pwrb structs sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_baseclasses.h
$(doc_dir)/sv_se/orm/pwrb_baseclasses_hpp.html :
@ echo "Generating html files for pwrb structs sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_baseclasses.hpp
$(doc_dir)/sv_se/orm/rt_plc_macro_%_h.html :
@ echo "Generating html files for pwrb code sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/rt/src/rt_plc_macro_*.h"
$(doc_dir)/sv_se/orm/rt_plc_%_c.html :
@ echo "Generating html files for pwrb code sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/rt/src/rt_plc_*.c"
$(doc_dir)/sv_se/orm/rt_c_%_c.html :
@ echo "Generating html files for pwrb code sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/rt/src/rt_c_*.c"
$(doc_dir)/sv_se/orm/rt_csup_c.html :
@ echo "Generating html files for pwrb code sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm "$(pwre_sroot)/lib/rt/src/rt_csup.c"
$(doc_dir)/en_us/pwrb.ps :
@ echo "Generating postscript file for pwrb classes..."
@ $(co_convert) -q -d $(doc_dir)/en_us "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
$(doc_dir)/sv_se/pwrb.ps :
@ echo "Generating postscript file for pwrb classes..."
@ $(co_convert) -q -l sv_se -d $(doc_dir)/sv_se "$(pwre_sroot)/wbl/pwrb/src/pwrb_*.wb_load"
$(exe_dir)/en_us/pwrb_xtthelp.dat :
......
......@@ -37,6 +37,15 @@ copy : $(inc_dir)/pwr_systemclasses.h \
lib : $(load_dir)/pwrs.dbs | silent
exe : $(doc_dir)/en_us/orm/pwrs_allclasses.html \
$(doc_dir)/sv_se/orm/pwrs_allclasses.html \
$(doc_dir)/en_us/orm/pwr_systemclasses_h.html \
$(doc_dir)/sv_se/orm/pwr_systemclasses_h.html \
$(doc_dir)/en_us/orm/pwr_h.html \
$(doc_dir)/sv_se/orm/pwr_h.html \
$(doc_dir)/en_us/orm/pwr_class_h.html \
$(doc_dir)/sv_se/orm/pwr_class_h.html \
$(doc_dir)/en_us/pwrs.ps \
$(doc_dir)/sv_se/pwrs.ps \
$(exe_dir)/en_us/pwrs_xtthelp.dat \
$(exe_dir)/sv_se/pwrs_xtthelp.dat \
| silent
......@@ -66,18 +75,41 @@ $(inc_dir)/pwr_systemclasses.hpp :
$(doc_dir)/en_us/orm/pwrs_allclasses.html :
@ echo "Generating html files for pwrs classes en_us..."
@ $(co_convert) -w -d $(doc_dir)/en_us/orm -y $(bld_dir)/pwrs.d_html_wbl -g $(pwre_sroot)/wbl/pwrs/src/cnv_setup.dat "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
$(doc_dir)/en_us/orm/pwr_systemclasses_h.html :
@ echo "Generating html files for pwrs structs en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_systemclasses.h
$(doc_dir)/en_us/orm/pwr_h.html :
@ echo "Generating html files for pwrs structs en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr.h
$(doc_dir)/en_us/orm/pwr_class_h.html :
@ echo "Generating html files for pwrs structs en_us..."
@ $(co_convert) -c -d $(doc_dir)/en_us/orm $(inc_dir)/pwr_class.h
$(doc_dir)/sv_se/orm/pwrs_allclasses.html :
@ echo "Generating html files for pwrs classes sv_se..."
@ $(co_convert) -w -l sv_se -d $(doc_dir)/sv_se/orm -g $(pwre_sroot)/wbl/pwrs/src/cnv_setup.dat "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
$(doc_dir)/sv_se/orm/pwr_systemclasses_h.html :
@ echo "Generating html files for pwrs structs sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_systemclasses.h
$(doc_dir)/sv_se/orm/pwr_h.html :
@ echo "Generating html files for pwrs structs sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr.h
$(doc_dir)/sv_se/orm/pwr_class_h.html :
@ echo "Generating html files for pwrs structs sv_se..."
@ $(co_convert) -c -d $(doc_dir)/sv_se/orm $(inc_dir)/pwr_class.h
$(doc_dir)/en_us/pwrs.ps :
@ echo "Generating postscript file for pwrs classes..."
@ $(co_convert) -q -d $(doc_dir)/en_us "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
$(doc_dir)/sv_se/pwrs.ps :
@ echo "Generating postscript file for pwrs classes..."
@ $(co_convert) -q -l sv_se -d $(doc_dir)/sv_se "$(pwre_sroot)/wbl/pwrs/src/pwrs_*.wb_load"
$(exe_dir)/en_us/pwrs_xtthelp.dat :
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment