Skip to content

P
proview
Commit 0c682062 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

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

parents e6c52bdf c343dac6
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
src/tools/pkg/cygwin/pwrrt/postinst
View file @ 0c682062
...@@ -258,8 +258,8 @@ if [ -e /etc/proview.cnf ]; then ...@@ -258,8 +258,8 @@ if [ -e /etc/proview.cnf ]; then
chown pwrp $web_dir/pwr_rt_client.jar chown pwrp $web_dir/pwr_rt_client.jar
cp /usr/pwrrt/lib/pwr_jop.jar $web_dir cp /usr/pwrrt/lib/pwr_jop.jar $web_dir
chown pwrp $web_dir/pwr_jop.jar chown pwrp $web_dir/pwr_jop.jar
cp /usr/pwrrt/lib/pwr_jopc.jar $web_dir cp /usr/pwrrt/lib/pwr_jopg.jar $web_dir
chown pwrp $web_dir/pwr_jopc.jar chown pwrp $web_dir/pwr_jopg.jar
fi fi
fi fi
......
src/tools/pkg/deb/pwrrt/postinst
View file @ 0c682062
...@@ -263,8 +263,8 @@ if [ -e /etc/proview.cnf ]; then ...@@ -263,8 +263,8 @@ if [ -e /etc/proview.cnf ]; then
chown pwrp $web_dir/pwr_rt_client.jar chown pwrp $web_dir/pwr_rt_client.jar
cp /usr/pwrrt/lib/pwr_jop.jar $web_dir cp /usr/pwrrt/lib/pwr_jop.jar $web_dir
chown pwrp $web_dir/pwr_jop.jar chown pwrp $web_dir/pwr_jop.jar
cp /usr/pwrrt/lib/pwr_jopc.jar $web_dir cp /usr/pwrrt/lib/pwr_jopg.jar $web_dir
chown pwrp $web_dir/pwr_jopc.jar chown pwrp $web_dir/pwr_jopg.jar
fi fi
fi fi
......
src/tools/pkg/deb_armel/pwrrt/postinst
View file @ 0c682062
...@@ -105,7 +105,7 @@ if [ -e /etc/proview.cnf ]; then ...@@ -105,7 +105,7 @@ if [ -e /etc/proview.cnf ]; then
if [ -e "$web_dir" ]; then if [ -e "$web_dir" ]; then
cp /usr/pwrrt/lib/pwr_rt_client.jar $web_dir cp /usr/pwrrt/lib/pwr_rt_client.jar $web_dir
cp /usr/pwrrt/lib/pwr_jop.jar $web_dir cp /usr/pwrrt/lib/pwr_jop.jar $web_dir
cp /usr/pwrrt/lib/pwr_jopc.jar $web_dir cp /usr/pwrrt/lib/pwr_jopg.jar $web_dir
fi fi
fi fi
......
src/tools/pkg/deb_x86_64/pwrrt/postinst
View file @ 0c682062
...@@ -263,8 +263,8 @@ if [ -e /etc/proview.cnf ]; then ...@@ -263,8 +263,8 @@ if [ -e /etc/proview.cnf ]; then
chown pwrp $web_dir/pwr_rt_client.jar chown pwrp $web_dir/pwr_rt_client.jar
cp /usr/pwrrt/lib/pwr_jop.jar $web_dir cp /usr/pwrrt/lib/pwr_jop.jar $web_dir
chown pwrp $web_dir/pwr_jop.jar chown pwrp $web_dir/pwr_jop.jar
cp /usr/pwrrt/lib/pwr_jopc.jar $web_dir cp /usr/pwrrt/lib/pwr_jopg.jar $web_dir
chown pwrp $web_dir/pwr_jopc.jar chown pwrp $web_dir/pwr_jopg.jar
fi fi
fi fi
......
src/tools/pkg/openbsd/pwrrt/postinst
View file @ 0c682062
...@@ -258,8 +258,8 @@ if [ -e /etc/proview.cnf ]; then ...@@ -258,8 +258,8 @@ if [ -e /etc/proview.cnf ]; then
chown pwrp $web_dir/pwr_rt_client.jar chown pwrp $web_dir/pwr_rt_client.jar
cp /usr/pwrrt/lib/pwr_jop.jar $web_dir cp /usr/pwrrt/lib/pwr_jop.jar $web_dir
chown pwrp $web_dir/pwr_jop.jar chown pwrp $web_dir/pwr_jop.jar
cp /usr/pwrrt/lib/pwr_jopc.jar $web_dir cp /usr/pwrrt/lib/pwr_jopg.jar $web_dir
chown pwrp $web_dir/pwr_jopc.jar chown pwrp $web_dir/pwr_jopg.jar
fi fi
fi fi
......
src/tools/pkg/ubu/pwrrt/postinst
View file @ 0c682062
...@@ -234,8 +234,8 @@ if [ -e /etc/proview.cnf ]; then ...@@ -234,8 +234,8 @@ if [ -e /etc/proview.cnf ]; then
chown pwrp $web_dir/pwr_rt_client.jar chown pwrp $web_dir/pwr_rt_client.jar
cp /usr/pwrrt/lib/pwr_jop.jar $web_dir cp /usr/pwrrt/lib/pwr_jop.jar $web_dir
chown pwrp $web_dir/pwr_jop.jar chown pwrp $web_dir/pwr_jop.jar
cp /usr/pwrrt/lib/pwr_jopc.jar $web_dir cp /usr/pwrrt/lib/pwr_jopg.jar $web_dir
chown pwrp $web_dir/pwr_jopc.jar chown pwrp $web_dir/pwr_jopg.jar
fi fi
fi fi
......
src/tools/pkg/ubu_x86_64/pwrrt/postinst
View file @ 0c682062
...@@ -234,8 +234,8 @@ if [ -e /etc/proview.cnf ]; then ...@@ -234,8 +234,8 @@ if [ -e /etc/proview.cnf ]; then
chown pwrp $web_dir/pwr_rt_client.jar chown pwrp $web_dir/pwr_rt_client.jar
cp /usr/pwrrt/lib/pwr_jop.jar $web_dir cp /usr/pwrrt/lib/pwr_jop.jar $web_dir
chown pwrp $web_dir/pwr_jop.jar chown pwrp $web_dir/pwr_jop.jar
cp /usr/pwrrt/lib/pwr_jopc.jar $web_dir cp /usr/pwrrt/lib/pwr_jopg.jar $web_dir
chown pwrp $web_dir/pwr_jopc.jar chown pwrp $web_dir/pwr_jopg.jar
fi fi
fi fi
......
xtt/lib/ge/src/ge_graph_javabean.cpp
View file @ 0c682062
...@@ -1708,13 +1708,13 @@ int Graph::export_javaframe( char *filename, char *bean_name, int applet, ...@@ -1708,13 +1708,13 @@ int Graph::export_javaframe( char *filename, char *bean_name, int applet,
" codebase=\"" << codebase << "\">" << endl << " codebase=\"" << codebase << "\">" << endl <<
" <PARAM NAME = CODE VALUE = " << bean_name << "_A.class >" << endl << " <PARAM NAME = CODE VALUE = " << bean_name << "_A.class >" << endl <<
" <PARAM NAME =\"archive\" VALUE =\"pwrp_" << systemname << "_web.jar," << " <PARAM NAME =\"archive\" VALUE =\"pwrp_" << systemname << "_web.jar," <<
"pwr_rt_client.jar,pwr_jop.jar,pwr_jopc.jar\">" << endl << "pwr_rt_client.jar,pwr_jop.jar,pwr_jopg.jar\">" << endl <<
" <PARAM NAME=\"type\" VALUE=\"application/x-java-applet;version=1.3\">" << endl << " <PARAM NAME=\"type\" VALUE=\"application/x-java-applet;version=1.3\">" << endl <<
" <PARAM NAME=\"scriptable\" VALUE=\"false\">" << endl << " <PARAM NAME=\"scriptable\" VALUE=\"false\">" << endl <<
" <PARAM NAME=\"instance\" VALUE=\"\">" << endl << " <PARAM NAME=\"instance\" VALUE=\"\">" << endl <<
" <embed type=\"application/x-java-applet;version=1.3\"" << endl << " <embed type=\"application/x-java-applet;version=1.3\"" << endl <<
" code = " << bean_name << "_A.class" << endl << " code = " << bean_name << "_A.class" << endl <<
" archive =\"pwrp_" << systemname << "_web.jar," <<"pwr_rt_client.jar,pwr_jop.jar,pwr_jopc.jar\"" << endl << " archive =\"pwrp_" << systemname << "_web.jar," <<"pwr_rt_client.jar,pwr_jop.jar,pwr_jopg.jar\"" << endl <<
" width=" << int(x1-x0) + 2*glow_cJBean_Offset << endl << " width=" << int(x1-x0) + 2*glow_cJBean_Offset << endl <<
" height=" << int(y1-y0) + 2*glow_cJBean_Offset << ">" << endl << " height=" << int(y1-y0) + 2*glow_cJBean_Offset << ">" << endl <<
" height=" << int(y1-y0) + 2*glow_cJBean_Offset << endl << " height=" << int(y1-y0) + 2*glow_cJBean_Offset << endl <<
...@@ -2013,13 +2013,13 @@ int Graph::export_gejava( char *filename, char *bean_name, int applet, int html) ...@@ -2013,13 +2013,13 @@ int Graph::export_gejava( char *filename, char *bean_name, int applet, int html)
" codebase=\"" << codebase << "\">" << endl << " codebase=\"" << codebase << "\">" << endl <<
" <PARAM NAME = CODE VALUE = " << bean_name << "_A.class >" << endl << " <PARAM NAME = CODE VALUE = " << bean_name << "_A.class >" << endl <<
" <PARAM NAME =\"archive\" VALUE =\"pwrp_" << systemname << "_web.jar," << " <PARAM NAME =\"archive\" VALUE =\"pwrp_" << systemname << "_web.jar," <<
"pwr_rt_client.jar,pwr_jop.jar,pwr_jopc.jar\">" << endl << "pwr_rt_client.jar,pwr_jop.jar,pwr_jopg.jar\">" << endl <<
" <PARAM NAME=\"type\" VALUE=\"application/x-java-applet;version=1.3\">" << endl << " <PARAM NAME=\"type\" VALUE=\"application/x-java-applet;version=1.3\">" << endl <<
" <PARAM NAME=\"scriptable\" VALUE=\"false\">" << endl << " <PARAM NAME=\"scriptable\" VALUE=\"false\">" << endl <<
" <PARAM NAME=\"instance\" VALUE=\"\">" << endl << " <PARAM NAME=\"instance\" VALUE=\"\">" << endl <<
" <embed type=\"application/x-java-applet;version=1.3\"" << endl << " <embed type=\"application/x-java-applet;version=1.3\"" << endl <<
" code = " << bean_name << "_A.class" << endl << " code = " << bean_name << "_A.class" << endl <<
" archive =\"pwrp_" << systemname << "_web.jar," <<"pwr_rt_client.jar,pwr_jop.jar,pwr_jopc.jar\"" << endl << " archive =\"pwrp_" << systemname << "_web.jar," <<"pwr_rt_client.jar,pwr_jop.jar,pwr_jopg.jar\"" << endl <<
" width=" << int(x1-x0) + 2*glow_cJBean_Offset << endl << " width=" << int(x1-x0) + 2*glow_cJBean_Offset << endl <<
" height=" << int(y1-y0) + 2*glow_cJBean_Offset << endl << " height=" << int(y1-y0) + 2*glow_cJBean_Offset << endl <<
" instance=\"\">" << endl << " instance=\"\">" << endl <<
......
xtt/lib/ge/src/ge_graph_web.cpp
View file @ 0c682062
...@@ -250,7 +250,7 @@ int Graph::generate_web( ldh_tSesContext ldhses) ...@@ -250,7 +250,7 @@ int Graph::generate_web( ldh_tSesContext ldhses)
strcpy( load_archives, (char *)value_p); strcpy( load_archives, (char *)value_p);
free( value_p); free( value_p);
strcpy( arlist, "pwr_rt_client.jar,pwr_jop.jar,pwr_jopc.jar"); strcpy( arlist, "pwr_rt_client.jar,pwr_jop.jar,pwr_jopg.jar");
// strcat( arlist ",pwr_bcomp.jar,pwr_bcompfc.jar,pwr_abb.jar"); // strcat( arlist ",pwr_bcomp.jar,pwr_bcompfc.jar,pwr_abb.jar");
dcli_trim( load_archives, load_archives); dcli_trim( load_archives, load_archives);
if ( strcmp( load_archives, "") != 0) { if ( strcmp( load_archives, "") != 0) {
...@@ -298,7 +298,7 @@ int Graph::generate_web( ldh_tSesContext ldhses) ...@@ -298,7 +298,7 @@ int Graph::generate_web( ldh_tSesContext ldhses)
" <object classid=\"clsid:8AD9C840-044E-11D1-B3E9-00805F499D93\"" << endl << " <object classid=\"clsid:8AD9C840-044E-11D1-B3E9-00805F499D93\"" << endl <<
" width=300 height=120 codebase=\"" << codebase << "\">" << endl << " width=300 height=120 codebase=\"" << codebase << "\">" << endl <<
" <param name = code value=jpwr.jop.JopLoginApplet.class >" << endl << " <param name = code value=jpwr.jop.JopLoginApplet.class >" << endl <<
" <param name =\"archive\" value=\"pwr_rt_client.jar,pwr_jop.jar,pwr_jopc.jar\">" << endl << " <param name =\"archive\" value=\"pwr_rt_client.jar,pwr_jop.jar,pwr_jopg.jar\">" << endl <<
" <param name=\"type\" value=\"application/x-java-applet;version=1.3\">" << endl << " <param name=\"type\" value=\"application/x-java-applet;version=1.3\">" << endl <<
" <param name=\"scriptable\" value=\"false\">" << endl << " <param name=\"scriptable\" value=\"false\">" << endl <<
" </body>" << endl << " </body>" << endl <<
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7