Plc link, problem with uppercase nodename for opt-file fixed

wb/changelog.txt

@@ -170,3 +170,4 @@
 101123 cs  wb        Lockfile added to directory and class volumes.
 110202 cs  wb        Bugfix in object editor, Ctrl+DoubleClick didn't work on attrrefs.
 110202 cs  wb        Plc compile, problem with compilation of component subwindow from plc editor fixed.
+110203 cs  wb        Plc link, problem with uppercase nodename for opt-file fixed.

wb/exp/com/src/os_linux/wb_gcg.sh

@@ -163,7 +163,7 @@ CompileRtNode()
 
 #link option file exists and is not empty
   if [ -s $pwrp_exe/$FileName.opt ]; then
-
+    echo "-- Using local option-file $FileName.opt"
     ld_opt_tmp="`cat $pwrp_exe/$FileName.opt`"
     ld_opt="`eval echo $ld_opt_tmp`"
   else
@@ -179,7 +179,7 @@ CompileRtNode()
     $pwr_obj/pwr_msg_rt.o $pwr_obj/pwr_msg_co.o \
     -lrt -lpwr_remote -lpwr_nmps -lpwr_rt -lpwr_co -lrpcsvc -lpwr_msg_dummy -lpthread -lm
   then
-    echo "-- Plc program linked for $OsStr $say_linkdebug node $FileName" 
+    echo "-- Plc program linked for $OsStr $say_linkdebug $OutFile" 
     gcg_status=$gcg__success
   else
     echo "** Plc program link errors for $OsStr node $FileName"

wb/exp/com/src/os_linux/wb_open_db.sh

@@ -33,7 +33,7 @@ if [ -z $database ]; then
   return
 fi
 
-if [ "`eval grep Ubuntu /etc/*-release`" != "" ]; then
+if [ "`eval grep Ubuntu /etc/*-release 2>/dev/null`" != "" ]; then
   export LC_TIME="en_US.UTF-8"
 elif [ -e /etc/debian_version ]; then
   export LC_TIME="en_US"

wb/exp/com/src/os_linux/wb_start.sh

@@ -25,7 +25,7 @@ username=$1
 password=$2
 volume=$3
 
-if [ "`eval grep Ubuntu /etc/*-release`" != "" ]; then
+if [ "`eval grep Ubuntu /etc/*-release 2>/dev/null`" != "" ]; then
   export LC_TIME="en_US.UTF-8"
 elif [ -e /etc/debian_version ]; then
   export LC_TIME="en_US"

wb/lib/wb/src/wb_build.cpp

@@ -94,7 +94,7 @@ void wb_build::node( char *nodename, void *volumelist, int volumecnt)
   char node[80];
   pwr_tStatus sumsts;
 
-  printf( "Build node %s\n", nodename);
+  printf( "-- Build node %s\n", nodename);
 
   wb_log::push();
 

wb/lib/wb/src/wb_dbs.cpp

@@ -340,7 +340,7 @@ wb_dbs::createFile()
   pwr_tStatus sts;
   int size;
     
-  printf("\n-- Working with load file volume '%s'...\n", m_v->name());
+  printf("-- Working with load file volume '%s'...\n", m_v->name());
 
   printf("-- Open file...\n");
   sts = openFile();

wb/lib/wb/src/wb_gcg.cpp

@@ -5153,11 +5153,13 @@ int	gcg_comp_rtnode(
 	gcg_t_threadlist	*threadlist;
 	unsigned long		thread_count;
 	char			text[80];
+	char			nodename_low[80];
 
 	gcg_debug = debug;
 
 	gcg_ctx_new( &gcgctx, 0);
 	strcpy(gcdir, GCDIR);
+	strncpy( nodename_low, cdh_Low(nodename), sizeof(nodename_low));
 
 	switch ( os) 
 	{
@@ -5333,7 +5335,7 @@ int	gcg_comp_rtnode(
 	{
 
 	  sprintf( fullfilename,"%s%s%s_%4.4d%s", gcdir, gcgmn_filenames[0], 
-		nodename, bus, GCEXT);
+		nodename_low, bus, GCEXT);
 	  dcli_translate_filename( fullfilename, fullfilename);
 	  if ((files[0] = fopen( fullfilename,"w")) == NULL) 
 	  {
@@ -5345,7 +5347,7 @@ int	gcg_comp_rtnode(
 
 	  if (IS_VMS_OR_ELN(os)) 
 	  {
-	    sprintf( fullfilename,"%splc_%s_%4.4d.opt", "pwrp_tmp:", cdh_Low(nodename), bus);
+	    sprintf( fullfilename,"%splc_%s_%4.4d.opt", "pwrp_tmp:", nodename_low, bus);
 	    dcli_translate_filename( fullfilename, fullfilename);
 	    if ((files[1] = fopen( fullfilename,"w")) == NULL) 
 	    {
@@ -5407,13 +5409,13 @@ int	gcg_comp_rtnode(
 	  files[0] = NULL;	   
 
 	  /* Create an object file */
-	  sprintf( module_name, "%s%s_%4.4d", gcgmn_filenames[0], nodename, bus);
+	  sprintf( module_name, "%s%s_%4.4d", gcgmn_filenames[0], nodename_low, bus);
 	  gcg_cc( GCG_PROC, module_name, NULL, NULL, os, GCG_NOSPAWN);
 
 	    /* print module in option file */
 	  if (IS_VMS_OR_ELN(os))
 	    fprintf( files[1],"%s%s%s_%4.4d\n", objdir, gcgmn_filenames[0], 
-		nodename, bus);
+		     nodename_low, bus);
 	
 	  /* Print plc libraries in option file */
 	  volumelist_ptr = volumelist;
@@ -5465,16 +5467,16 @@ int	gcg_comp_rtnode(
 	  if (IS_VMS_OR_ELN(os)) 
 	  {
 	    sprintf( plcfilename, "pwrp_exe:plc_%s_%4.4d_%5.5ld.exe",
-		cdh_Low(nodename), bus, plc_version);
-	    sprintf( fullfilename,"%s%s_%4.4d", gcgmn_filenames[0], nodename, bus);
+		     nodename_low, bus, plc_version);
+	    sprintf( fullfilename,"%s%s_%4.4d", gcgmn_filenames[0], nodename_low, bus);
 	    gcg_cc( GCG_RTNODE, fullfilename, plcfilename, NULL, os,
 	          GCG_NOSPAWN);
 	  } 
 	  else
 	  {
 	    sprintf( plcfilename, "plc_%s_%4.4d_%5.5ld",
-		cdh_Low(nodename), bus, plc_version);
-	    sprintf( fullfilename,"%s%s_%4.4d", gcgmn_filenames[0], nodename, bus);
+		     nodename_low, bus, plc_version);
+	    sprintf( fullfilename,"%s%s_%4.4d", gcgmn_filenames[0], nodename_low, bus);
 	    gcg_cc( GCG_RTNODE, fullfilename, plcfilename, 
 	        plclib_frozen, os, GCG_NOSPAWN);
 	  }

wb/lib/wb/src/wb_lfu.cpp

@@ -305,7 +305,6 @@ pwr_tStatus lfu_create_bootfile(
 	    if ( EVEN(sts)) return sts;
 
 	    sprintf( plcname, load_cNamePlc, "", cdh_Low(nodename), bus, (int)plc_version);
-	    printf( "      %s\n", plcname);
 
 	    sts = gcg_comp_rtnode( nodename, os,
 			bus, 1, &errorcount, &warningcount, debug, node_vollist,