casa / casa5 / 47385152760

Commits

Ville Suoranta authored 47385152760 Merge 09 May 2017

Merge pull request #46 in CASA/casa from bugfix/CAS-10112 to master

* commit 'd4335fe0f079a130a5498ed0360cf71b09a102cf':
  CAS-10112 Fix buildmytasks path handling

gcwrap/install/buildmytasks

Modified

-143
+   echo "Please visit http://www.oracle.com/technetwork/java/javase/downloads/index.html to obtain java."
-144
+   echo "If(Once) java is installed you will need to put java's location in your PATH for buildmytasks to run"
-145
+   exit
-146
+fi
-147
+verbose "Saxon processor: $SAXONJAR"
-148
+SAXON="java -jar $SAXONJAR"
-149
+verbose "Saxon command: $SAXON"
-150
-151
+if [[ `uname -s` = "Darwin" ]]; then
-152
+   INFOFILE=`mktemp bmt`
--
+else
-+
+else
-154
+   INFOFILE=`mktemp`
-155
+fi
-156
+verbose "intermediate task file: $INFOFILE"
-157
+[ ! -e "$INFOFILE" ] && error "can't create an intermediate file $INFOFILE!"
-158
-159
+for FILE in $XMLFILES; do
-160
+  XMLFILE=${FILE%.xml}
-161
+ if [ ! -e "$XMLFILE.xml" ]; then
-162
+   warning "$XMLFILE.xml not a file!"
-163
+ else
-164
+	  verbose "generating `basename -- "$XMLFILE"` task ... "
-165
+	  xmlgenpy "$XMLFILE"
-166
+	  $SAXON "$XMLFILE.xml" "$XMLROOT/casa2tsum3.xsl" >> $INFOFILE
--
+	  sed -i -e 's+pathname=.*$+pathname="file://'${INSTALLDIR}'/"+' "$XMLFILE.py"
--
+	  sed -i -e 's+pathname=.*$+pathname="file://'${INSTALLDIR}'/"+' "${XMLFILE}_cli.py"
--
+	  [ -e "${XMLFILE}_pg.py" ] && sed -i -e 's+pathname=.*$+pathname="file://'${INSTALLDIR}'/"+' "${XMLFILE}_pg.py"
-+
+	  sed -i -e 's+pathname=.*$+pathname="file://'"${INSTALLDIR}"'/"+' "$XMLFILE.py"
-+
+	  sed -i -e 's+pathname=.*$+pathname="file://'"${INSTALLDIR}"'/"+' "${XMLFILE}_cli.py"
-+
+	  [ -e "${XMLFILE}_pg.py" ] && sed -i -e 's+pathname=.*$+pathname="file://'"${INSTALLDIR}"'/"+' "${XMLFILE}_pg.py"
-170
+	  if [[ "${INSTALLDIR}" != "${WORKDIR}" ]]; then
-171
+	    mv -f "${XMLFILE}.py" "${INSTALLDIR}"
-172
+	    mv -f "${XMLFILE}_cli.py" "${INSTALLDIR}"
-173
+	    [ -e "${XMLFILE}_pg.py" ] && mv -f "${XMLFILE}_pg.py" "${INSTALLDIR}"
-174
+	    cp -f "${XMLFILE}.xml" "${INSTALLDIR}"
-175
+	    cp -f "task_${XMLFILE}.py" "${INSTALLDIR}"
-176
+	  fi
-177
+	fi
-178
+done
-179
-180
+verbose "generating `basename -- "$OUTFILE"` file ... "
-181
+sed -i -e 's/^tasksum/mytasks/g' "$INFOFILE"
-182
+sed -i -e "s^\(task_location.*\) \(''\)^\1 \'${INSTALLDIR}\'^g" "$INFOFILE"
-183
--
+cat /dev/null > $OUTFILE
--
+echo "#" >> $OUTFILE
--
+echo "# User defined tasks setup." >> $OUTFILE
--
+echo "# Generated from buildmytask." >> $OUTFILE
--
+echo "#" >> $OUTFILE
--
+echo >> $OUTFILE
--
+echo "import sys" >> $OUTFILE
--
+echo "from casa_stack_manip import stack_frame_find" >> $OUTFILE
--
+echo >> $OUTFILE
--
+echo "if sys.path[1] != '"$INSTALLDIR"':" >> $OUTFILE
--
+echo "  sys.path.insert(1, '"$INSTALLDIR"')" >> $OUTFILE
--
+echo "from odict import odict" >> $OUTFILE
--
+echo "if not globals().has_key('mytasks') :" >> $OUTFILE
--
+echo "  mytasks = odict()" >> $OUTFILE
--
+echo >> $OUTFILE
--
+grep "^mytasks" $INFOFILE >> $OUTFILE
--
+echo >> $OUTFILE
--
+echo "if not globals().has_key('task_location') :" >>$OUTFILE
--
+echo "  task_location = odict()" >> $OUTFILE
--
+echo >> $OUTFILE
--
+grep "^task_location" $INFOFILE >> $OUTFILE
--
+echo "myglobals = stack_frame_find( )" >> $OUTFILE
--
+echo "tasksum = myglobals['tasksum'] " >> $OUTFILE
--
+echo "for key in mytasks.keys() :" >> $OUTFILE
--
+echo "  tasksum[key] = mytasks[key]" >> $OUTFILE
--
+echo >> $OUTFILE
--
+grep "^from" $INFOFILE >> $OUTFILE
-+
+cat /dev/null > "$OUTFILE"
-+
+echo "#" >> "$OUTFILE"
-+
+echo "# User defined tasks setup." >> "$OUTFILE"
-+
+echo "# Generated from buildmytask." >> "$OUTFILE"
-+
+echo "#" >> "$OUTFILE"
-+
+echo >> "$OUTFILE"
-+
+echo "import sys" >> "$OUTFILE"
-+
+echo "from casa_stack_manip import stack_frame_find" >> "$OUTFILE"
-+
+echo >> "$OUTFILE"
-+
+echo "if sys.path[1] != '"$INSTALLDIR"':" >> "$OUTFILE"
-+
+echo "  sys.path.insert(1, '"$INSTALLDIR"')" >> "$OUTFILE"
-+
+echo "from odict import odict" >> "$OUTFILE"
-+
+echo "if not globals().has_key('mytasks') :" >> "$OUTFILE"
-+
+echo "  mytasks = odict()" >> "$OUTFILE"
-+
+echo >> "$OUTFILE"
-+
+grep "^mytasks" $INFOFILE >> "$OUTFILE"
-+
+echo >> "$OUTFILE"
-+
+echo "if not globals().has_key('task_location') :" >>"$OUTFILE"
-+
+echo "  task_location = odict()" >> "$OUTFILE"
-+
+echo >> "$OUTFILE"
-+
+grep "^task_location" $INFOFILE >> "$OUTFILE"
-+
+echo "myglobals = stack_frame_find( )" >> "$OUTFILE"
-+
+echo "tasksum = myglobals['tasksum'] " >> "$OUTFILE"
-+
+echo "for key in mytasks.keys() :" >> "$OUTFILE"
-+
+echo "  tasksum[key] = mytasks[key]" >> "$OUTFILE"
-+
+echo >> "$OUTFILE"
-+
+grep "^from" $INFOFILE >> "$OUTFILE"
-211
-212
+rm -f "$INFOFILE"
--

casa5

Commits

Jira Issues

Add shortcut