Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
77685925
Commit
77685925
authored
Nov 24, 2003
by
claes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*** empty log message ***
parent
69394212
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
12 deletions
+35
-12
src/exp/com/src/os_linux/pwrp_env.sh
src/exp/com/src/os_linux/pwrp_env.sh
+1
-0
src/exp/com/src/os_linux/wb_rtt_appl.sh
src/exp/com/src/os_linux/wb_rtt_appl.sh
+11
-0
src/exp/inc/src/pwr_version.h
src/exp/inc/src/pwr_version.h
+11
-11
src/exp/rt/src/rt_plc_process.c
src/exp/rt/src/rt_plc_process.c
+1
-1
src/tools/bld/src/os_linux/rules.mk
src/tools/bld/src/os_linux/rules.mk
+11
-0
No files found.
src/exp/com/src/os_linux/pwrp_env.sh
View file @
77685925
...
@@ -840,6 +840,7 @@ pwrc_set_func()
...
@@ -840,6 +840,7 @@ pwrc_set_func()
export
pwrp_lis
=
$pwrp_root
/
$platform
/lis
export
pwrp_lis
=
$pwrp_root
/
$platform
/lis
export
PATH
=
$PATH
:
$pwrp_exe
export
PATH
=
$PATH
:
$pwrp_exe
export
CDPATH
=
$pwrp_root
:
$pwrp_root
/common:
$pwrp_root
/x86_linux:
$pwrp_src
export
pwrp_projectname
=
$pname
export
pwrp_projectname
=
$pname
...
...
src/exp/com/src/os_linux/wb_rtt_appl.sh
View file @
77685925
...
@@ -33,6 +33,16 @@ then
...
@@ -33,6 +33,16 @@ then
ar rc
$pwrp_lib
/
${
arname_pict
}
ar rc
$pwrp_lib
/
${
arname_pict
}
fi
fi
#link option file exists and is not empty
if
[
-s
$pwrp_exe
/ra_rtt.opt
]
;
then
ld_opt_tmp
=
"
`
cat
$pwrp_exe
/ra_rtt.opt
`
"
ld_opt
=
"
`
eval echo
$ld_opt_tmp
`
"
else
ld_opt
=
""
fi
cc
=
gcc
cc
=
gcc
cinc
=
"-I
$pwr_inc
-I
$pwrp_rttbld
-I-"
cinc
=
"-I
$pwr_inc
-I
$pwrp_rttbld
-I-"
cflags
=
"-DOS_LINUX=1 -DOS=linux -DHW_X86=1 -DHW=x86 -O3 -DGNU_SOURCE -DPWR_NDEBUG -D_REENTRANT"
cflags
=
"-DOS_LINUX=1 -DOS=linux -DHW_X86=1 -DHW=x86 -O3 -DGNU_SOURCE -DPWR_NDEBUG -D_REENTRANT"
...
@@ -47,6 +57,7 @@ then
...
@@ -47,6 +57,7 @@ then
${
ld
}
${
linkflags
}
-o
$pwrp_exe
/
${
exename
}
$pwrp_obj
/
${
menuname
}
.o
\
${
ld
}
${
linkflags
}
-o
$pwrp_exe
/
${
exename
}
$pwrp_obj
/
${
menuname
}
.o
\
$pwr_obj
/dtt_rttsys.o
$pwr_obj
/rt_io_user.o
\
$pwr_obj
/dtt_rttsys.o
$pwr_obj
/rt_io_user.o
\
$pwrp_lib
/
${
arname_pict
}
$pwrp_lib
/
${
arname
}
\
$pwrp_lib
/
${
arname_pict
}
$pwrp_lib
/
${
arname
}
\
$ld_opt
\
-lpwr_dtt
\
-lpwr_dtt
\
-lpwr_rt
-lpwr_co
-lpwr_msg_dummy
-lrpcsvc
-lpthread
-lm
-lposix1b
-lrt
-lpwr_rt
-lpwr_co
-lpwr_msg_dummy
-lrpcsvc
-lpthread
-lm
-lposix1b
-lrt
fi
fi
...
...
src/exp/inc/src/pwr_version.h
View file @
77685925
...
@@ -45,22 +45,22 @@
...
@@ -45,22 +45,22 @@
# define SET_VERSION(a, b, c, d) ((pwr_tVersion)((a << 24) + (a << 16) + (a << 8) + a))
# define SET_VERSION(a, b, c, d) ((pwr_tVersion)((a << 24) + (a << 16) + (a << 8) + a))
#endif
#endif
#define pwrv_cBuildTimeStr "
15 Dec 2000
"
#define pwrv_cBuildTimeStr "
24 Nov 2003
"
#define pwrv_cPwrVersionStr "V
3.9
.0"
#define pwrv_cPwrVersionStr "V
4.0
.0"
#define pwrv_cPwrVersion SET_VERSION('V',
3, 9
, 0)
#define pwrv_cPwrVersion SET_VERSION('V',
4, 0
, 0)
#define pwrv_cSmdVersion SET_VERSION('V',
3, 9
, 0)
#define pwrv_cSmdVersion SET_VERSION('V',
4, 0
, 0)
#define pwrv_cSmdVersionStr "V3.9.0"
#define pwrv_cSmdVersionStr "V3.9.0"
#define pwrv_cBmdVersion SET_VERSION('V',
3, 9
, 0)
#define pwrv_cBmdVersion SET_VERSION('V',
4, 0
, 0)
#define pwrv_cBmdVersionStr "V
3.9
.0"
#define pwrv_cBmdVersionStr "V
4.0
.0"
#define pwrv_cWbdbVersion SET_VERSION('V',
3, 9
, 0)
#define pwrv_cWbdbVersion SET_VERSION('V',
4, 0
, 0)
#define pwrv_cWbdbVersionStr "V
3.9
.0"
#define pwrv_cWbdbVersionStr "V
4.0
.0"
#define pwrv_cWbdbVersionShortStr "V
39
"
#define pwrv_cWbdbVersionShortStr "V
40
"
#define pwrv_cLffVersion SET_VERSION('V',
3, 9
, 0)
#define pwrv_cLffVersion SET_VERSION('V',
4, 0
, 0)
#define pwrv_cLffVersionStr "V
3.9
.0"
#define pwrv_cLffVersionStr "V
4.0
.0"
#endif
#endif
src/exp/rt/src/rt_plc_process.c
View file @
77685925
...
@@ -370,7 +370,7 @@ link_io_base_areas (
...
@@ -370,7 +370,7 @@ link_io_base_areas (
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
di_a
,
"pwrNode-active-io-di"
,
pp
->
IOHandler
->
DiCount
*
sizeof
(
pwr_tBoolean
));
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
di_a
,
"pwrNode-active-io-di"
,
pp
->
IOHandler
->
DiCount
*
sizeof
(
pwr_tBoolean
));
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
do_a
,
"pwrNode-active-io-do"
,
pp
->
IOHandler
->
DoCount
*
sizeof
(
pwr_tBoolean
));
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
do_a
,
"pwrNode-active-io-do"
,
pp
->
IOHandler
->
DoCount
*
sizeof
(
pwr_tBoolean
));
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
dv_a
,
"pwrNode-active-io-dv"
,
pp
->
IOHandler
->
DvCount
*
sizeof
(
pwr_tBoolean
));
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
dv_a
,
"pwrNode-active-io-dv"
,
pp
->
IOHandler
->
DvCount
*
sizeof
(
pwr_tBoolean
));
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
av_i
,
"pwrNode-active-io-av_init"
,
pp
->
IOHandler
->
DvCount
*
sizeof
(
pwr_tIn
t32
));
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
av_i
,
"pwrNode-active-io-av_init"
,
pp
->
IOHandler
->
AvCount
*
sizeof
(
pwr_tFloa
t32
));
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
dv_i
,
"pwrNode-active-io-dv_init"
,
pp
->
IOHandler
->
DvCount
*
sizeof
(
pwr_tInt32
));
dlink_area
((
plc_sDlink
*
)
&
pp
->
base
.
dv_i
,
"pwrNode-active-io-dv_init"
,
pp
->
IOHandler
->
DvCount
*
sizeof
(
pwr_tInt32
));
}
}
...
...
src/tools/bld/src/os_linux/rules.mk
View file @
77685925
...
@@ -195,6 +195,13 @@ $(exe_dir)/%.gif : %.gif
...
@@ -195,6 +195,13 @@ $(exe_dir)/%.gif : %.gif
@
$(log_h_h)
@
$(log_h_h)
@
$(cp)
$(cpflags)
$(source)
$(target)
@
$(cp)
$(cpflags)
$(source)
$(target)
$(doc_dir)/orm/%.gif
:
%.gif
@
$(log_h_h)
@
$(cp)
$(cpflags)
$(source)
$(target)
$(doc_dir)/%.gif
:
%.gif
@
$(log_h_h)
@
$(cp)
$(cpflags)
$(source)
$(target)
$(cnf_dir)/%.wb_vers
:
%.wb_load
$(cnf_dir)/%.wb_vers
:
%.wb_load
@
$(log_wb_load_wb_vers)
@
$(log_wb_load_wb_vers)
...
@@ -213,4 +220,8 @@ $(exe_dir)/%.html : ../../%.html
...
@@ -213,4 +220,8 @@ $(exe_dir)/%.html : ../../%.html
@
$(log_h_h)
@
$(log_h_h)
@
$(cp)
$(cpflags)
$(source)
$(target)
@
$(cp)
$(cpflags)
$(source)
$(target)
$(doc_dir)/%.html
:
../../%.html
@
$(log_h_h)
@
$(cp)
$(cpflags)
$(source)
$(target)
endif
endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment