Changeset 2728 for trunk

Timestamp:

02/12/10 13:33:21 (2 years ago)

Author:

erkn

Message:

merged branch farhi_configure_100204 into trunk after testing

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (8 diffs)
• build.bat (deleted)
• build.bat.in (copied) (copied from branches/farhi_configure_100204/build.bat.in)
• configure.in (modified) (11 diffs)
• doc/man/mcconvert.1 (deleted)
• doc/man/mcconvert.1.in (copied) (copied from branches/farhi_configure_100204/doc/man/mcconvert.1.in)
• doc/man/mcdisplay.1 (deleted)
• doc/man/mcdisplay.1.in (copied) (copied from branches/farhi_configure_100204/doc/man/mcdisplay.1.in)
• doc/man/mcdoc.1 (deleted)
• doc/man/mcdoc.1.in (copied) (copied from branches/farhi_configure_100204/doc/man/mcdoc.1.in)
• doc/man/mcformat.1 (deleted)
• doc/man/mcformat.1.in (copied) (copied from branches/farhi_configure_100204/doc/man/mcformat.1.in)
• doc/man/mcgui.1 (deleted)
• doc/man/mcgui.1.in (copied) (copied from branches/farhi_configure_100204/doc/man/mcgui.1.in)
• doc/man/mcplot.1 (deleted)
• doc/man/mcplot.1.in (copied) (copied from branches/farhi_configure_100204/doc/man/mcplot.1.in)
• doc/man/mcrun.1 (deleted)
• doc/man/mcrun.1.in (copied) (copied from branches/farhi_configure_100204/doc/man/mcrun.1.in)
• doc/man/mcstas.1 (deleted)
• doc/man/mcstas.1.in (copied) (copied from branches/farhi_configure_100204/doc/man/mcstas.1.in)
• lib/Makefile.in (modified) (2 diffs)
• lib/share/mccode-r.c (modified) (11 diffs)
• lib/share/mccode-r.h (deleted)
• lib/share/mccode-r.h.in (copied) (copied from branches/farhi_configure_100204/lib/share/mccode-r.h.in)
• lib/share/nexus-lib.c (modified) (2 diffs)
• lib/tools/perl/mccode_config.perl.in (modified) (1 diff)
• lib/tools/perl/mccode_reconfigure.in (modified) (2 diffs)
• lib/tools/perl/mcgnuplot.pl (modified) (1 diff)
• lib/tools/perl/mcoptimlib.pl (modified) (1 diff)
• lib/tools/perl/mcrunlib.pl (modified) (1 diff)
• mkdist (modified) (13 diffs)
• nlib/contrib/Virtual_tripoli4_output.comp (modified) (1 diff)
• nlib/share/mcstas-r.h (modified) (1 diff)
• src/Makefile.in (modified) (7 diffs)
• src/cogen.c (modified) (1 diff)
• src/cogenmx.c (modified) (1 diff)
• src/instrument.y (modified) (5 diffs)
• src/mccode.h (deleted)
• src/mccode.h.in (copied) (copied from branches/farhi_configure_100204/src/mccode.h.in)
• src/mcconfig.pl (modified) (1 diff)
• src/mcdaemon.pl (modified) (1 diff)
• src/mcdisplay.pl (modified) (2 diffs)
• src/mcdoc.pl (modified) (5 diffs)
• src/mcformat.c (deleted)
• src/mcformat.c.in (copied) (copied from branches/farhi_configure_100204/src/mcformat.c.in)
• src/mcformatgui.pl (modified) (1 diff)
• src/mcgui.pl (modified) (5 diffs)
• src/mcplot.pl (modified) (2 diffs)
• src/mcrun.pl (modified) (3 diffs)
• src/mcstas2vitess.pl (modified) (1 diff)
• src/port.h.in (modified) (2 diffs)
• support/Win32/install/mcstas.nsi (deleted)
• support/Win32/install/mcstas.nsi.in (copied) (copied from branches/farhi_configure_100204/support/Win32/install/mcstas.nsi.in)
• support/common/Makefile.in (modified) (3 diffs)
• support/deb/control (deleted)
• support/deb/control.in (copied) (copied from branches/farhi_configure_100204/support/deb/control.in)
• support/deb/debcreate (deleted)
• support/deb/debcreate.in (copied) (copied from branches/farhi_configure_100204/support/deb/debcreate.in)
• xlib/share/mcxtrace-r.h (modified) (2 diffs)

trunk/Makefile.in

@@ -1 @@
-# Makefile for @PACKAGE_NAME@.
+# Makefile for @MCCODE_NAME@.
 #
-#   This file is part of the @PACKAGE_NAME@ ray-trace simulation package
+#   This file is part of the @MCCODE_NAME@ ray-trace simulation package
 #   Copyright (C) 1997-2008, All rights reserved
 #   Risoe National Laborartory, Roskilde, Denmark
@@ -26 +26 @@
 # make plotter         best plotter choice
 # make pgplot          plotter PGPLOT selection and perl-PGPLOT install
-# make reconfigure     reconfigure @PACKAGE_TARNAME@ installation (after software update)
+# make reconfigure     reconfigure @MCCODE_TARNAME@ installation (after software update)
 # make install-pgplot  build and install PGPLOT
 # make install-scilab  build and install Scilab
@@ -42 +42 @@
 
 DEBUG = -DDEBUG=0
-libdir_@PACKAGE_TARNAME@ = $(libdir)/@PACKAGE_TARNAME@
+libdir_@MCCODE_TARNAME@ = $(libdir)/@MCCODE_TARNAME@
 
 CC = @CC@
@@ -52 +52 @@
 USE_NEXUS = @HAVE_NEXUS@
 
-DEFS = @PACKAGE_NAME@ @DEFS@ $(DEBUG)
+DEFS = @MCCODE_NAME@ @DEFS@ $(DEBUG)
 LIBS = @LIBS@
 
@@ -81 +81 @@
 #
 
-all: @PACKAGE_TARNAME@
+all: @MCCODE_TARNAME@
 
-@PACKAGE_TARNAME@: $(OBJECTS)
+@MCCODE_TARNAME@: $(OBJECTS)
         cd src/ && $(MAKE)
 
@@ -113 +113 @@
 
 scilab:
-        sed "s/PLOTTER => '.*'./PLOTTER => 'Scilab'\,/" lib/tools/perl/@PACKAGE_TARNAME@_config.perl > lib/tools/perl/@PACKAGE_TARNAME@_config.perl.tmp
-        mv lib/tools/perl/@PACKAGE_TARNAME@_config.perl.tmp lib/tools/perl/@PACKAGE_TARNAME@_config.perl
+        sed "s/PLOTTER => '.*'./PLOTTER => 'Scilab'\,/" lib/tools/perl/@MCCODE_TARNAME@_config.perl > lib/tools/perl/@MCCODE_TARNAME@_config.perl.tmp
+        mv lib/tools/perl/@MCCODE_TARNAME@_config.perl.tmp lib/tools/perl/@MCCODE_TARNAME@_config.perl
 matlab:
-        sed "s/PLOTTER => '.*'./PLOTTER => 'Matlab'\,/" lib/tools/perl/@PACKAGE_TARNAME@_config.perl > lib/tools/perl/@PACKAGE_TARNAME@_config.perl.tmp
-        mv lib/tools/perl/@PACKAGE_TARNAME@_config.perl.tmp lib/tools/perl/@PACKAGE_TARNAME@_config.perl
+        sed "s/PLOTTER => '.*'./PLOTTER => 'Matlab'\,/" lib/tools/perl/@MCCODE_TARNAME@_config.perl > lib/tools/perl/@MCCODE_TARNAME@_config.perl.tmp
+        mv lib/tools/perl/@MCCODE_TARNAME@_config.perl.tmp lib/tools/perl/@MCCODE_TARNAME@_config.perl
 pgplot:
-        sed "s/PLOTTER => '.*'./PLOTTER => 'McStas'\,/" lib/tools/perl/@PACKAGE_TARNAME@_config.perl > lib/tools/perl/@PACKAGE_TARNAME@_config.perl.tmp
-        mv lib/tools/perl/@PACKAGE_TARNAME@_config.perl.tmp lib/tools/perl/@PACKAGE_TARNAME@_config.perl
+        sed "s/PLOTTER => '.*'./PLOTTER => 'McStas'\,/" lib/tools/perl/@MCCODE_TARNAME@_config.perl > lib/tools/perl/@MCCODE_TARNAME@_config.perl.tmp
+        mv lib/tools/perl/@MCCODE_TARNAME@_config.perl.tmp lib/tools/perl/@MCCODE_TARNAME@_config.perl
 vrml:
-        sed "s/PLOTTER => '.*'./PLOTTER => 'VRML'\,/" lib/tools/perl/@PACKAGE_TARNAME@_config.perl > lib/tools/perl/@PACKAGE_TARNAME@_config.perl.tmp
-        mv lib/tools/perl/@PACKAGE_TARNAME@_config.perl.tmp lib/tools/perl/@PACKAGE_TARNAME@_config.perl
+        sed "s/PLOTTER => '.*'./PLOTTER => 'VRML'\,/" lib/tools/perl/@MCCODE_TARNAME@_config.perl > lib/tools/perl/@MCCODE_TARNAME@_config.perl.tmp
+        mv lib/tools/perl/@MCCODE_TARNAME@_config.perl.tmp lib/tools/perl/@MCCODE_TARNAME@_config.perl
 PGPLOT: pgplot
 Matlab: matlab
@@ -136 +136 @@
 
 reconfigure:
-        cd $(libdir_@PACKAGE_TARNAME@)/tools/perl/
-        $(libdir_@PACKAGE_TARNAME@)/tools/perl/@PACKAGE_TARNAME@_reconfigure
+        cd $(libdir_@MCCODE_TARNAME@)/tools/perl/
+        $(libdir_@MCCODE_TARNAME@)/tools/perl/mccode_reconfigure
 
 # Optional auto install of patched perl-Tk, scilab and pgplot5 libs
@@ -143 +143 @@
         cd support/common && $(MAKE) install-pgplot
         make pgplot
-        @echo "@PACKAGE_NAME@: run 'make reconfigure'"
+        @echo "@MCCODE_NAME@: run 'make reconfigure'"
 
 install-scilab:
-        cd support/common && $(MAKE) compile-scilab && echo "@PACKAGE_NAME@: run './configure; make; make install' again"
+        cd support/common && $(MAKE) compile-scilab && echo "@MCCODE_NAME@: run './configure; make; make install' again"
 

trunk/configure.in

@@ -1 +1 @@
 #
-#   This file is part of the McStas/McXtrace @PACKAGE_STRING@ neutron ray-trace simulation package
+#   This file is part of the McStas/McXtrace @MCCODE_STRING@ neutron ray-trace simulation package
 #   Copyright (C) 1997-2010, All rights reserved
 #   Risoe National Laborartory, Roskilde, Denmark
@@ -19 +19 @@
 #
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(@PACKAGE_NAME@, @PACKAGE_VERSION@, @PACKAGE_TARNAME@-support@@PACKAGE_TARNAME@.org)
+AC_INIT(@MCCODE_NAME@, @MCCODE_VERSION@, @MCCODE_TARNAME@-support@@MCCODE_TARNAME@.org)
 AC_REVISION($Revision: 1.1$)
 AC_COPYRIGHT([Copyright (C) Copyright, All rights reserved
@@ -26 +26 @@
 This software is covered by the GNU LESSER GENERAL PUBLIC LICENSE
 see file COPYING for further information])
+
+# set default package defines
+MCCODE_TARNAME=$PACKAGE_TARNAME
+MCCODE_NAME=$PACKAGE_NAME
+MCCODE_VERSION=$PACKAGE_VERSION
+MCCODE_STRING=$PACKAGE_STRING
+MCCODE_BUGREPORT=$PACKAGE_BUGREPORT
+MCCODE_DATE="@MCCODE_DATE@"
 
 AC_PREFIX_DEFAULT(/usr/local)
@@ -48 +56 @@
   exit 1
 elif test x"$enable_mcstas" == "xyes" ; then
-  PACKAGE_TARNAME=[mcstas]
-  PACKAGE_NAME=McStas
-  if [[ -e lib/tools/perl/mcxtrace_config.perl.in ]]; then
-    mv lib/tools/perl/mcxtrace_config.perl.in lib/tools/perl/mccode_config.perl.in
-  fi
-  if [[ -e lib/tools/perl/mcxtrace_reconfigure.in ]]; then
-    mv lib/tools/perl/mcxtrace_reconfigure.in lib/tools/perl/mccode_reconfigure.in
-  fi
+  MCCODE_TARNAME=[mcstas]
+  MCCODE_NAME=McStas
 elif test x"$enable_mcxtrace" == "xyes" ; then
-  PACKAGE_TARNAME=[mcxtrace]
-  PACKAGE_NAME=McXtrace
-  if [[ -e lib/tools/perl/mcstas_config.perl.in ]]; then
-    mv lib/tools/perl/mcstas_config.perl.in lib/tools/perl/mccode_config.perl.in
-  fi
-  if [[ -e lib/tools/perl/mcxtrace_reconfigure.in ]]; then
-    mv lib/tools/perl/mcxtrace_reconfigure.in lib/tools/perl/mccode_reconfigure.in
-  fi
+  MCCODE_TARNAME=[mcxtrace]
+  MCCODE_NAME=McXtrace
 fi
 
@@ -72 +68 @@
   DAY=`date +"%d"`
   YEAR=`date +"%Y"`
-  PACKAGE_DATE="$MONTH-$DAY-$YEAR"
-  PACKAGE_VERSION="$MONTH-$DAY-$YEAR"
-  PACKAGE_STRING="$PACKAGE_NAME-$PACKAGE_VERSION"
-  MCCODE_VERSION="$PACKAGE_NAME $PACKAGE_VERSION - $MONTH $DAY $YEAR"
+  MCCODE_DATE="$MONTH. $DAY, $YEAR"
+  MCCODE_VERSION="$MONTH-$DAY-$YEAR"
+  MCCODE_STRING="$MCCODE_NAME $MCCODE_VERSION - $MONTH. $DAY, $YEAR"
+  MCCODE_BUGREPORT="$MCCODE_TARNAME-support@$MCCODE_TARNAME.org"
   
-  echo "Configurating McCode with $PACKAGE_NAME flavour"
-  echo "PACKAGE_DATE=$PACKAGE_DATE"
-  echo "PACKAGE_VERSION=$PACKAGE_VERSION"
+  echo "Configurating McCode with $MCCODE_NAME flavour"
+  echo "MCCODE_DATE=$MCCODE_DATE"
+  echo "MCCODE_TARNAME=$MCCODE_TARNAME"
+  echo "MCCODE_NAME=$MCCODE_NAME"
   echo "MCCODE_VERSION=$MCCODE_VERSION"
-  echo "PACKAGE_TARNAME=$PACKAGE_TARNAME"
-  echo "PACKAGE_NAME=$PACKAGE_NAME"
-  echo "PACKAGE_STRING=$PACKAGE_STRING"
-  for file in src/mccode.h src/mcformat.c doc/man/*.1 support/deb/debcreate support/deb/control support/Win32/install/mcstas.nsi build.bat lib/share/mccode-r.h lib/tools/perl/mccode_reconfigure.in;
-  do
-    for iter in 1 2 3;
-    do
-      sed 's/@MCCODE_VERSION@/'$PACKAGE_NAME'-'$PACKAGE_VERSION' - '$MONTH'. '$DAY', '$YEAR'/' $file > $file.tmp
-      sed 's/@PACKAGE_DATE@/'$MONTH'. '$DAY', '$YEAR'/'                                        $file.tmp > $file
-      sed 's/@PACKAGE_TARNAME@/'$PACKAGE_TARNAME'/'                                            $file > $file.tmp
-      sed 's/@PACKAGE_NAME@/'$PACKAGE_NAME'/'                                                  $file.tmp > $file
-      sed 's/@PACKAGE_VERSION@/'$PACKAGE_VERSION'/'                                            $file > $file.tmp
-      sed 's/@PACKAGE_STRING@/'$PACKAGE_NAME'-'$PACKAGE_VERSION'/'                             $file.tmp > $file
-      rm $file.tmp
-    done
-  done
-  # update corresponding DEFINE string in all makefiles
-  AC_DEFINE_UNQUOTED([MCCODE_VERSION], "${MCCODE_VERSION}")
-  AC_SUBST([MCCODE_VERSION])
-fi
+  echo "MCCODE_STRING=$MCCODE_STRING"
+  echo "MCCODE_BUGREPORT=$MCCODE_BUGREPORT"
+
+fi
+# update corresponding DEFINE string in all makefiles
+AC_DEFINE_UNQUOTED([MCCODE_DATE], "${MCCODE_DATE}")
+AC_DEFINE_UNQUOTED([MCCODE_TARNAME], "${MCCODE_TARNAME}")
+AC_DEFINE_UNQUOTED([MCCODE_NAME], "${MCCODE_NAME}")
+AC_DEFINE_UNQUOTED([MCCODE_VERSION], "${MCCODE_VERSION}")
+AC_DEFINE_UNQUOTED([MCCODE_STRING], "${MCCODE_STRING}")
+AC_DEFINE_UNQUOTED([MCCODE_BUGREPORT], "${MCCODE_BUGREPORT}")
 # activate substitution in all .in files
-AC_SUBST([PACKAGE_DATE])
-AC_SUBST([PACKAGE_TARNAME])
-AC_SUBST([PACKAGE_NAME])
-AC_SUBST([PACKAGE_VERSION])
-AC_SUBST([PACKAGE_STRING])
+AC_SUBST([MCCODE_DATE])
+AC_SUBST([MCCODE_TARNAME])
+AC_SUBST([MCCODE_NAME])
+AC_SUBST([MCCODE_VERSION])
+AC_SUBST([MCCODE_STRING])
+AC_SUBST([MCCODE_BUGREPORT])
 
 AC_PROG_INSTALL
@@ -171 +160 @@
 fi
 
-# make sure the target config file and reconfigure scripts are named properly
-if [[ -e lib/tools/perl/mccode_config.perl.in ]]; then
-  mv lib/tools/perl/mccode_config.perl.in lib/tools/perl/${PACKAGE_TARNAME}_config.perl.in
-fi
-if [[ -e lib/tools/perl/mccode_reconfigure.in ]]; then
-  mv lib/tools/perl/mccode_reconfigure.in lib/tools/perl/${PACKAGE_TARNAME}_reconfigure.in
-fi
-
-AC_OUTPUT(Makefile src/Makefile src/port.h lib/Makefile nlib/Makefile xlib/Makefile lib/tools/perl/${PACKAGE_TARNAME}_config.perl lib/tools/perl/${PACKAGE_TARNAME}_reconfigure support/common/Makefile support/common/pgplot/Makefile support/common/pgplot/makehtml support/common/pgplot/maketex)
-
-chmod a+x lib/tools/perl/${PACKAGE_TARNAME}_reconfigure
+AC_OUTPUT(Makefile src/Makefile src/port.h lib/Makefile nlib/Makefile xlib/Makefile lib/tools/perl/mccode_config.perl lib/tools/perl/mccode_reconfigure support/common/Makefile support/common/pgplot/Makefile support/common/pgplot/makehtml support/common/pgplot/maketex src/mccode.h lib/share/mccode-r.h src/mcformat.c doc/man/*.1 support/deb/debcreate support/deb/control support/Win32/install/mcstas.nsi build.bat)
+
+chmod a+x lib/tools/perl/${MCCODE_TARNAME}_reconfigure
 
 # warnings and errors
@@ -188 +169 @@
 fi
 if test "x$HAVE_NEXUS" != "x" ; then
-echo "Activating NeXus support in $PACKAGE_STRING ($HAVE_NEXUS)"
+echo "Activating NeXus support in $MCCODE_STRING ($HAVE_NEXUS)"
 fi
 if test "$MAKE" == "no" ; then
-  echo "ERROR: $PACKAGE_STRING installation requires 'make' or 'gmake'"
+  echo "ERROR: $MCCODE_STRING installation requires 'make' or 'gmake'"
   exit
 fi
@@ -198 +179 @@
   echo "WARNING: No Perl executable could be found !"
   echo "The commands mcrun and mcgui won't be available. You will have to use:"
-  echo "   $PACKAGE_TARNAME <file>.instr"
+  echo "   $MCCODE_TARNAME <file>.instr"
   echo "   $CC -o <file>.out <file>.instr -lm"
   echo "   <file>.out [simulation parameters]"
@@ -216 +197 @@
 echo ""
 if test "$PGPLOT" == "no" ; then
-  echo "To install PGPLOT for $PACKAGE_STRING, you need:"
+  echo "To install PGPLOT for $MCCODE_STRING, you need:"
   echo "= perl-PDL (perldl, pdl)"
   echo "= a fortran compiler (g77, gfortran)"
@@ -222 +203 @@
 fi
 if test "$PGPLOT" == "no" && test "$PERLDL" != "no" && test "$G77" != "no" ; then
-  echo "PGPLOT install: you may try our automatic pgplot5 installation AFTER installing @PACKAGE_STRING@"
+  echo "PGPLOT install: you may try our automatic pgplot5 installation AFTER installing @MCCODE_STRING@"
   echo "# make install-pgplot"
   echo "# make reconfigure"
   echo "(For 64-bit machines, reconfigure first: # ./configure --with-pic )"
 else if test "$PGPLOT" == "no" ; then
-  echo "To use PGPLOT, install these packages and re-run $PACKAGE_STRING installation ./configure"
+  echo "To use PGPLOT, install these packages and re-run $MCCODE_STRING installation ./configure"
   fi
 fi
@@ -254 +235 @@
 fi
 echo ""
-echo "After (optional) plotter config, build and install $PACKAGE_STRING by executing"
+echo "After (optional) plotter config, build and install $MCCODE_STRING by executing"
 echo "# make; make install"
-echo "will install $PACKAGE_STRING into $prefix"
+echo "will install $MCCODE_STRING into $prefix"
 echo ""
 if test "$DASH" != "no" ; then

trunk/lib/Makefile.in

@@ -14 +14 @@
 INSTALL_DATA = @INSTALL_DATA@
 
-libdir_mccode = $(libdir)/@PACKAGE_TARNAME@
+libdir_mccode = $(libdir)/@MCCODE_TARNAME@
 
-install: install_@PACKAGE_TARNAME@
+install: install_@MCCODE_TARNAME@
 
-install_@PACKAGE_TARNAME@: installdirs
+install_@MCCODE_TARNAME@: installdirs
         if [ -d $(libdir_mccode) ]; then \
           echo "Moving your old library dir $(libdir_mccode) to $(libdir_mccode).`date +%Y%m%d_%H.%M`"; \
@@ -62 +62 @@
 
 installdirs:
-        $(topdir)/mkinstalldirs $(bindir) $(libdir) $(libdir_@PACKAGE_TARNAME@) $(mandir)/man1
+        $(topdir)/mkinstalldirs $(bindir) $(libdir) $(libdir_@MCCODE_TARNAME@) $(mandir)/man1
 

trunk/lib/share/mccode-r.c

@@ -394 +394 @@
       "%PREURL:    http://www.mccode.org/\n"
       "%PREEditor: %USR\n"
-      "%PRECreator:%SRC simulation (" MCCODE_VERSION ")\n"
+      "%PRECreator:%SRC simulation (" MCCODE_STRING ")\n"
       "%PREDate:   Simulation started (%DATL) %DAT\n"
       "%PREFile:   %FIL\n",
@@ -415 +415 @@
       "mc_%VPA.URL    ='http://www.mccode.org';\n"
       "mc_%VPA.Editor ='%USR';\n"
-      "mc_%VPA.Creator='%SRC " MCCODE_VERSION " simulation';\n"
+      "mc_%VPA.Creator='%SRC " MCCODE_STRING " simulation';\n"
       "mc_%VPA.Date   =%DATL; // for getdate\n"
       "mc_%VPA.File   ='%FIL';\n",
@@ -490 +490 @@
       "mc_%VPA.URL    ='http://www.mccode.org';\n"
       "mc_%VPA.Editor ='%USR';\n"
-      "mc_%VPA.Creator='%SRC " MCCODE_VERSION " simulation';\n"
+      "mc_%VPA.Creator='%SRC " MCCODE_STRING " simulation';\n"
       "mc_%VPA.Date   =%DATL; %% for datestr\n"
       "mc_%VPA.File   ='%FIL';\n",
@@ -643 +643 @@
       "%7$s={Format:'%FMT',URL:'http://www.mccode.org',"
       "Editor:'%USR',$\n"
-      "Creator:'%SRC " MCCODE_VERSION " simulation',$\n"
+      "Creator:'%SRC " MCCODE_STRING " simulation',$\n"
       "Date:%DATL,"
       "File:'%FIL'}\n",
@@ -662 +662 @@
       "URL:    http://www.nexusformat.org/\n"
       "Editor: %USR\n"
-      "Creator:%SRC " MCCODE_VERSION " [www.mccode.org].\n"
+      "Creator:%SRC " MCCODE_STRING " [www.mccode.org].\n"
       "Date:   Simulation started (%DATL) %DAT\n"
       "File:   %FIL\n"
       "View with Mozilla, InternetExplorer, gxmlviewer, kxmleditor\n-->\n"
       "<NX%PAR file_name=\"%FIL\" file_time=\"%DAT\" user=\"%USR\">\n"
-        "<NXentry name=\"" MCCODE_VERSION "\"><start_time>%DAT</start_time>\n",
+        "<NXentry name=\"" MCCODE_STRING "\"><start_time>%DAT</start_time>\n",
     "<end_time>%DAT</end_time></NXentry></NX%PAR>\n<!-- EndDate:%DAT -->\n",
     "%PRE<NX%TYP name=\"%NAM\">\n",
@@ -686 +686 @@
       "\"http://www.w3.org/TR/html4/strict.dtd\">\n"
       "<HTML><HEAD><META name=\"Author\" content=\"%PAR\">\n"
-      "<META name=\"Creator\" content=\"%PAR (%SRC) " MCCODE_VERSION " [www.mccode.org] simulation\">\n"
+      "<META name=\"Creator\" content=\"%PAR (%SRC) " MCCODE_STRING " [www.mccode.org] simulation\">\n"
       "<META name=\"Date\" content=\"%DAT\">\n"
       "<TITLE>[McStas %PAR (%SRC)]%FIL</TITLE></HEAD>\n"
@@ -692 +692 @@
         "McStas simulation %SRC (%SRC): Result file %FIL.html</a></h1></center><br>\n"
         "This simulation report was automatically created by"
-        " <a href=\"http://www.mccode.org/\"><i>" MCCODE_VERSION "</i></a><br>\n"
+        " <a href=\"http://www.mccode.org/\"><i>" MCCODE_STRING "</i></a><br>\n"
         "<pre>User:   %USR<br>\n"
         "%PRECreator: <a href=\"%SRC\">%SRC</a> %PAR McStas simulation<br>\n"
@@ -715 +715 @@
       "mc_%VPA.URL    ='http://www.mccode.org';\n"
       "mc_%VPA.Editor ='%USR';\n"
-      "mc_%VPA.Creator='%SRC " MCCODE_VERSION " simulation';\n"
+      "mc_%VPA.Creator='%SRC " MCCODE_STRING " simulation';\n"
       "mc_%VPA.Date   =%DATL; %% for datestr\n"
       "mc_%VPA.File   ='%FIL';\n",
@@ -969 +969 @@
       "  %VPA={'Format':'%FMT','URL':'http://www.mccode.org',\\\n"
       "  'Editor':'%USR',\\\n"
-      "  'Creator':'%SRC " MCCODE_VERSION " [www.mccode.org]',\\\n"
+      "  'Creator':'%SRC " MCCODE_STRING " [www.mccode.org]',\\\n"
       "  'Date':%DATL,\\\n"
       "  'File':'%FIL'}\n",
@@ -990 +990 @@
       "%PREURL:    http://www.mccode.org/\n"
       "%PREEditor: %USR\n"
-      "%PRECreator:%SRC simulation (" MCCODE_VERSION ")\n"
+      "%PRECreator:%SRC simulation (" MCCODE_STRING ")\n"
       "%PREDate:   Simulation started (%DATL) %DAT\n"
       "%PREFile:   %FIL\n",
@@ -4136 +4136 @@
   int i;
 
+  fprintf(stderr, "%s (%s) instrument simulation, generated with " MCCODE_STRING " (" MCCODE_DATE ")\n", mcinstrument_name, mcinstrument_source);
   fprintf(stderr, "Usage: %s [options] [parm=value ...]\n", pgmname);
   fprintf(stderr,

trunk/lib/share/nexus-lib.c

@@ -83 +83 @@
     }
     char creator[CHAR_BUF_LENGTH];
-    sprintf(creator, "%s " MCCODE_VERSION " [www.mcstas.org]", instrname);
+    sprintf(creator, "%s gerenated with " MCCODE_STRING " (" MCCODE_DATE ") [www.mccode.org]", instrname);
     NXputattr(nxhandle, "creator", creator, strlen(creator), NX_CHAR);
     NXputattr(nxhandle, "simulation_begin", date, strlen(date), NX_CHAR);
@@ -156 +156 @@
     t=stfile.st_mtime; strncpy(nxname, ctime(&t), CHAR_BUF_LENGTH);
     NXputattr (nxhandle, "file_date", nxname, strlen(nxname), NX_CHAR);
-    NXputattr (nxhandle, "McCode_version", MCCODE_VERSION, strlen(MCCODE_VERSION), NX_CHAR);
+    NXputattr (nxhandle, "MCCODE_STRING", MCCODE_STRING, strlen(MCCODE_STRING), NX_CHAR);
     NXputattr (nxhandle, "name", parent, strlen(parent), NX_CHAR);
     

trunk/lib/tools/perl/mccode_config.perl.in

@@ -67 +67 @@
      CFLAGS => '@CFLAGS@',
      LDFLAGS => '@LDFLAGS@',
-     MCCODE => '@PACKAGE_TARNAME@',
+     MCCODE => '@MCCODE_TARNAME@',
      CC => '@CC@',
      AT => '@AT@',

trunk/lib/tools/perl/mccode_reconfigure.in

@@ -20 +20 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(@PACKAGE_NAME@, @PACKAGE_VERSION@, @PACKAGE_TARNAME@-support@@PACKAGE_TARNAME@.org)
+AC_INIT(@MCCODE_NAME@, @MCCODE_VERSION@, @MCCODE_TARNAME@-support@@MCCODE_TARNAME@.org)
 AC_REVISION($Revision: 1.1$)
 AC_COPYRIGHT([Copyright (C) Copyright, All rights reserved
@@ -87 +87 @@
 fi
 
-AC_OUTPUT($prefix/lib/@PACKAGE_TARNAME@/tools/perl/@PACKAGE_TARNAME@_config.perl)
+AC_OUTPUT($prefix/lib/@MCCODE_TARNAME@/tools/perl/@MCCODE_TARNAME@_config.perl)
 
-chmod a+w $prefix/lib/@PACKAGE_TARNAME@/tools/perl/@PACKAGE_TARNAME@_config.perl
+chmod a+w $prefix/lib/@MCCODE_TARNAME@/tools/perl/@MCCODE_TARNAME@_config.perl
 
-echo "McStas has been reconfigured in $prefix/lib/mcstas/tools/perl/@PACKAGE_TARNAME@_config.perl"
+echo "McStas has been reconfigured in $prefix/lib/mcstas/tools/perl/@MCCODE_TARNAME@_config.perl"

trunk/lib/tools/perl/mcgnuplot.pl

@@ -30 +30 @@
 my $termnum = 0;
 my $default_term;
-# This part should perhaps go to mcstas_config.perl
+# This part should perhaps go to mccode_config.perl
 if ($Config{'osname'} eq 'MSWin32') {
   $default_term="windows";

trunk/lib/tools/perl/mcoptimlib.pl

@@ -22 +22 @@
 
 use Math::Amoeba qw(MinimiseND);
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.mcstas/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.mcstas/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.mcstas/mccode_config.perl") {
+  require $ENV{"HOME"}."/.mcstas/mccode_config.perl";
 }
 

trunk/lib/tools/perl/mcrunlib.pl

@@ -25 +25 @@
 use File::stat;
 use Cwd;
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.mcstas/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.mcstas/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.mcstas/mccode_config.perl") {
+  require $ENV{"HOME"}."/.mcstas/mccode_config.perl";
 }
 

trunk/mkdist

@@ -32 +32 @@
 # define version and symbols that will be replaced in many places
 if [ "y$2" = "ymcxtrace" ]; then
-  PACKAGE_TARNAME=mcxtrace
-  PACKAGE_NAME=McXtrace
+  MCCODE_TARNAME=mcxtrace
+  MCCODE_NAME=McXtrace
 else
-  PACKAGE_TARNAME=mcstas
-  PACKAGE_NAME=McStas
-fi
-PACKAGE_VERSION=$1
-PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"
+  MCCODE_TARNAME=mcstas
+  MCCODE_NAME=McStas
+fi
+MCCODE_VERSION=$1
 MONTH=`date +"%b"`
 DAY=`date +"%d"`
 YEAR=`date +"%Y"`
-PACKAGE_DATE="'$MONTH'. '$DAY', '$YEAR'"
+MCCODE_DATE="$MONTH. $DAY, $YEAR"
+MCCODE_STRING="$MCCODE_NAME $MCCODE_VERSION - $MONTH. $DAY, $YEAR"
 
 # Create temporary workdir:
 PW=`pwd`
 TMPDIR=$PWD/..
-DIST=$TMPDIR/$PACKAGE_TARNAME-$PACKAGE_VERSION
+DIST=$TMPDIR/$MCCODE_TARNAME-$MCCODE_VERSION
 
 # Copy current PW checkout to DIST
@@ -57 +57 @@
 then
   cd $PW/../../McStasTeX/trunk
-  ./build $PACKAGE_VERSION
+  ./build $MCCODE_VERSION
   
   # copy the doc in DIST/doc. Only use PDF files in distro.
-  mv $PACKAGE_TARNAME-$PACKAGE_VERSION-manual.pdf $DIST/doc/manuals/$PACKAGE_TARNAME-manual.pdf
-  mv $PACKAGE_TARNAME-$PACKAGE_VERSION-components.pdf $DIST/doc/manuals/$PACKAGE_TARNAME-components.pdf
+  mv $MCCODE_TARNAME-$MCCODE_VERSION-manual.pdf $DIST/doc/manuals/$MCCODE_TARNAME-manual.pdf
+  mv $MCCODE_TARNAME-$MCCODE_VERSION-components.pdf $DIST/doc/manuals/$MCCODE_TARNAME-components.pdf
   cp -r $DIST/doc $DIST/lib
 fi
@@ -75 +75 @@
 
 # Put in new version info:
-# MCCODE_VERSION="PACKAGE_NAME PACKAGE_VERSION - PACKAGE_DATE"
-echo "Set version $PACKAGE_VERSION and date"
-find . -wholename './setversion' -prune -o -type d -prune -o -path ./src/McStasTest -exec ./setversion \{\} $PACKAGE_VERSION \;
+# MCCODE_STRING="MCCODE_NAME MCCODE_VERSION - MCCODE_DATE"
+echo "Set version $MCCODE_VERSION and date"
+find . -wholename './setversion' -prune -o -type d -prune -o -path ./src/McStasTest -exec ./setversion \{\} $MCCODE_VERSION \;
 find . -wholename './setyear'    -prune -o -type d -prune -o -path ./src/McStasTest -exec ./setyear \{\} \;
 
 # we update all package/version strings
-echo "Set package $PACKAGE_VERSION information"
-for file in src/mccode.h src/mcformat.c doc/man/*.1 support/deb/debcreate support/deb/control support/Win32/install/mcstas.nsi build.bat lib/share/mccode-r.h configure.in lib/tools/perl/mccode_reconfigure.in src/mccode.h src/mcformat.c doc/man/*.1 support/deb/debcreate support/deb/control support/Win32/install/mcstas.nsi build.bat lib/share/mccode-r.h configure.in lib/tools/perl/mccode_reconfigure.in src/mccode.h src/mcformat.c doc/man/*.1 support/deb/debcreate support/deb/control support/Win32/install/mcstas.nsi build.bat lib/share/mccode-r.h configure.in lib/tools/perl/mccode_reconfigure.in;
+echo "Set package $MCCODE_VERSION information"
+for iter in 1 2 3;
 do
-  sed 's/@MCCODE_VERSION@/'$PACKAGE_NAME'-'$PACKAGE_VERSION' - '$MONTH'. '$DAY', '$YEAR'/' $file > $file.tmp
-  sed 's/@PACKAGE_DATE@/'$MONTH'. '$DAY', '$YEAR'/'                                        $file.tmp > $file
-  sed 's/@PACKAGE_TARNAME@/'$PACKAGE_TARNAME'/'                                            $file > $file.tmp
-  sed 's/@PACKAGE_NAME@/'$PACKAGE_NAME'/'                                                  $file.tmp > $file
-  sed 's/@PACKAGE_VERSION@/'$PACKAGE_VERSION'/'                                            $file > $file.tmp
-  sed 's/@PACKAGE_STRING@/'$PACKAGE_NAME'-'$PACKAGE_VERSION'/'                             $file.tmp > $file
-  rm $file.tmp
+for file in configure.in lib/tools/perl/mccode_reconfigure.in src/mccode.h lib/share/mccode-r.h src/mcformat.c doc/man/*.1 support/deb/debcreate support/deb/control support/Win32/install/mcstas.nsi build.bat  ;
+        do
+          sed 's/@MCCODE_STRING@/'$MCCODE_NAME'-'$MCCODE_VERSION' - '$MONTH'. '$DAY', '$YEAR'/' $file > $file.tmp
+    sed 's/@MCCODE_NAME@/'$MCCODE_NAME'/'                                                 $file.tmp > $file
+    sed 's/@MCCODE_TARNAME@/'$MCCODE_TARNAME'/'                                           $file > $file.tmp
+    sed 's/@MCCODE_VERSION@/'$MCCODE_VERSION'/'                                           $file.tmp > $file
+    sed 's/@MCCODE_DATE@/'$MONTH'. '$DAY', '$YEAR'/'                                      $file > $file.tmp
+    mv $file.tmp $file
+        done
 done
 chmod a+x support/deb/debcreate
@@ -134 +136 @@
 autoconf -o configure $CONFIGURE_IN
 #chmod a+x configure
-autoconf -o lib/tools/perl/${PACKAGE_TARNAME}_reconfigure.in lib/tools/perl/mccode_reconfigure.in
-mv lib/tools/perl/mccode_config.perl.in lib/tools/perl/${PACKAGE_TARNAME}_config.perl.in
+autoconf -o lib/tools/perl/${MCCODE_TARNAME}_reconfigure.in lib/tools/perl/mccode_reconfigure.in
+mv lib/tools/perl/mccode_config.perl.in lib/tools/perl/${MCCODE_TARNAME}_config.perl.in
 rm lib/tools/perl/mccode_reconfigure.in
 
@@ -166 +168 @@
 
 # Create tar archive
-tar cfz $PW/../$PACKAGE_TARNAME-$PACKAGE_VERSION-src.tar.gz $PACKAGE_TARNAME-$PACKAGE_VERSION
+tar cfz $PW/../$MCCODE_TARNAME-$MCCODE_VERSION-src.tar.gz $MCCODE_TARNAME-$MCCODE_VERSION
 
 # Do a 'make' for creation of binary version (should apply to 'any' Unix)
@@ -186 +188 @@
 
 # Create tar archive
-tar cfz $PW/../$PACKAGE_TARNAME-$PACKAGE_VERSION-$MACH-$PROC-$UNAME.tar.gz $PACKAGE_TARNAME-$PACKAGE_VERSION
+tar cfz $PW/../$MCCODE_TARNAME-$MCCODE_VERSION-$MACH-$PROC-$UNAME.tar.gz $MCCODE_TARNAME-$MCCODE_VERSION
 
 # Remove temporary dir
@@ -204 +206 @@
 cp support/Win32/install/which.exe .
 cd ..
-tar cfz $PW/../$PACKAGE_TARNAME-$PACKAGE_VERSION-Win32-src.tar.gz $PACKAGE_TARNAME-$PACKAGE_VERSION
+tar cfz $PW/../$MCCODE_TARNAME-$MCCODE_VERSION-Win32-src.tar.gz $MCCODE_TARNAME-$MCCODE_VERSION
+echo "  "
+echo "========================================================================="
+echo "mkdist: Distro creation for $MCCODE_STRING"
 if [ `which makensis` ]; then
     cd -
@@ -216 +221 @@
     cp LICENSE.rtf ..
     cd ..
-    zip -r $PACKAGE_TARNAME-$PACKAGE_VERSION-i686-Intel-Win32.zip $PACKAGE_TARNAME-$PACKAGE_VERSION
+    zip -r $MCCODE_TARNAME-$MCCODE_VERSION-i686-Intel-Win32.zip $MCCODE_TARNAME-$MCCODE_VERSION
     cp winsupport/* .
     makensis mcstas.nsi
@@ -225 +230 @@
 echo
 echo
-echo Your $PACKAGE_STRING dist packages are placed in
-echo ../$PACKAGE_TARNAME-$PACKAGE_VERSION-src.tar.gz
-echo ../$PACKAGE_TARNAME-$PACKAGE_VERSION-$MACH-$PROC-$UNAME.tar.gz
-echo ../$PACKAGE_TARNAME-$PACKAGE_VERSION-Win32-src.tar.gz
+echo Your $MCCODE_STRING dist packages are placed in
+echo ../$MCCODE_TARNAME-$MCCODE_VERSION-src.tar.gz
+echo ../$MCCODE_TARNAME-$MCCODE_VERSION-$MACH-$PROC-$UNAME.tar.gz
+echo ../$MCCODE_TARNAME-$MCCODE_VERSION-Win32-src.tar.gz
 echo
 echo NOTE: Win32 version must be built using \'build.bat\' of the Win32-src package
 echo
-echo Your $PACKAGE_STRING doc packages are placed in
-echo ../$PACKAGE_TARNAME-$PACKAGE_VERSION-manual.ps.gz
-echo ../$PACKAGE_TARNAME-$PACKAGE_VERSION-manual.pdf
-echo ../$PACKAGE_TARNAME-$PACKAGE_VERSION-components.ps.gz
-echo ../$PACKAGE_TARNAME-$PACKAGE_VERSION-components.pdf
+if [ -d $PW/../../McStasTeX/trunk ] ;
+then
+echo Your $MCCODE_STRING doc packages are placed in
+echo ../$MCCODE_TARNAME-$MCCODE_VERSION-manual.ps.gz
+echo ../$MCCODE_TARNAME-$MCCODE_VERSION-manual.pdf
+echo ../$MCCODE_TARNAME-$MCCODE_VERSION-components.ps.gz
+echo ../$MCCODE_TARNAME-$MCCODE_VERSION-components.pdf
+fi
 echo
 echo WARNING: Please install to a test system and run the following tools
@@ -254 +262 @@
     # Note: DMG file needs enough space to hold the support tools plus
     # our own code. April 2008 this is about 120 megs...
-    dd if=/dev/zero of=./$PACKAGE_TARNAME-$PACKAGE_VERSION.dmg bs=1M count=130
-    /sbin/mkfs.hfsplus -v $PACKAGE_NAME ./$PACKAGE_TARNAME-$PACKAGE_VERSION.dmg
+    dd if=/dev/zero of=./$MCCODE_TARNAME-$MCCODE_VERSION.dmg bs=1M count=130
+    /sbin/mkfs.hfsplus -v $MCCODE_NAME ./$MCCODE_TARNAME-$MCCODE_VERSION.dmg
     # Likely needs root level access:
     sudo mkdir /mnt/dmg
-    sudo mount -t hfsplus -o loop ./$PACKAGE_TARNAME-$PACKAGE_VERSION.dmg /mnt/dmg
+    sudo mount -t hfsplus -o loop ./$MCCODE_TARNAME-$MCCODE_VERSION.dmg /mnt/dmg
     # Copy the ./adm/OSX/DMG stuff to the mountpoint
     sudo cp -rp ./adm/OSX/DMG/Applications /mnt/dmg
@@ -265 +273 @@
     sudo find /mnt/dmg -type d -name CVS -exec rm -rf \{\} \;
     # Copy McStas there
-    sudo cp ./$PACKAGE_TARNAME-$$PACKAGE_VERSION-src.tar.gz /mnt/dmg/Applications
+    sudo cp ./$MCCODE_TARNAME-$MCCODE_VERSION-src.tar.gz /mnt/dmg/Applications
     # Unmount
     sudo umount /mnt/dmg
     sudo rm -rf /mnt/dmg
-    ls -l ./$PACKAGE_TARNAME-$$PACKAGE_VERSION.dmg
+    ls -l ./$MCCODE_TARNAME-$MCCODE_VERSION.dmg
 fi
 
@@ -285 +293 @@
     sudo rm -rf etch-chroot/usr/local/lib/*
     sudo rm -rf etch-chroot/usr/local/pgplot
-    sudo cp $PACKAGE_TARNAME-$$PACKAGE_VERSION/deb/debcreate etch-chroot/root
-    sudo cp $PACKAGE_TARNAME-$$PACKAGE_VERSION-src.tar.gz etch-chroot/root
+    sudo cp $MCCODE_TARNAME-$MCCODE_VERSION/deb/debcreate etch-chroot/root
+    sudo cp $MCCODE_TARNAME-$MCCODE_VERSION-src.tar.gz etch-chroot/root
     sudo chroot etch-chroot /root/debcreate
     echo
@@ -293 +301 @@
     echo
     cp etch-chroot/build/*deb .
-    ls -lf $PACKAGE_TARNAME-$$PACKAGE_VERSION*.*
+    ls -lf $MCCODE_TARNAME-$MCCODE_VERSION*.*
     echo
   else

trunk/nlib/contrib/Virtual_tripoli4_output.comp

@@ -97 +97 @@
   fprintf(hfile,"# Tripoli4  batch file %s written by %s\n", 
     (filename && strcmp(filename,"NULL") && strcmp(filename,"0") && strcmp(filename,"stdout") ? filename : "stdout"), 
-    MCCODE_VERSION);
+    MCCODE_STRING);
   fprintf(hfile,"# Generated by component %s in instrument %s (%s)\n", NAME_CURRENT_COMP, mcinstrument_name, mcinstrument_source);
   fprintf(hfile,"# Format: Tripoli4 data text file with header\n");

trunk/nlib/share/mcstas-r.h

@@ -26 +26 @@
 *   extern MCNUM  mcAbsorbProp[];
 *   extern MCNUM  mcScattered;
-*   #define MCCODE_VERSION "the McStas version"
+*   #define MCCODE_STRING "the McStas version"
 *
 * Usage: Automatically embbeded in the c code.

trunk/src/Makefile.in

@@ -1 @@
-# Makefile for @PACKAGE_NAME@.
-#
-#   This file is part of the @PACKAGE_NAME@ ray-trace simulation package
+# Makefile for @MCCODE_NAME@.
+#
+#   This file is part of the @MCCODE_NAME@ ray-trace simulation package
 #   Copyright (C) 1997-2008, All rights reserved
 #   Risoe National Laborartory, Roskilde, Denmark
@@ -26 +26 @@
 # make test            distro self-test
 # make plotter         best plotter choice
-# make reconfigure     reconfigure @PACKAGE_TARNAME@ installation (after software update)
+# make reconfigure     reconfigure @MCCODE_TARNAME@ installation (after software update)
 
 
@@ -42 +42 @@
 
 DEBUG = -DDEBUG=0
-libdir_mccode = $(libdir)/@PACKAGE_TARNAME@
+libdir_mccode = $(libdir)/@MCCODE_TARNAME@
 
 CC = @CC@
@@ -125 +125 @@
         @chmod +x $(subst mc,mx,$@)
 
-all: $(BINOBJS_@PACKAGE_TARNAME@)
+all: $(BINOBJS_@MCCODE_TARNAME@)
 
 mcstas: $(OBJECTS_mcstas)
@@ -163 +163 @@
         etags *.[chly]
 
-install: install_@PACKAGE_TARNAME@
+install: install_@MCCODE_TARNAME@
         $(INSTALL_DATA) $(topdir)/doc/man/*.1 $(mandir)/man1
-        chmod a+x $(libdir_mccode)/tools/perl/@PACKAGE_TARNAME@_reconfigure
+        chmod a+x $(libdir_mccode)/tools/perl/mccode_reconfigure
         @echo "Install additional Perl modules..."
         mkdir $(libdir_mccode)/tools/perl/modules
         cd $(topdir)/support/common && $(MAKE) perl-modules
         @echo "================================================================"
-        @echo "Installation finished. Thanks for using @PACKAGE_NAME@"
-        @echo @PACKAGE_NAME@ library has been installed in 
-        @echo MCSTAS=$(libdir_mccode), and binaries in $(bindir)
+        @echo "Installation of @MCCODE_STRING@ finished."
+        @echo "  library  in MCSTAS=$(libdir_mccode)"
+        @echo "  binaries in        $(bindir)"
+        @echo "Thanks for using @MCCODE_NAME@"  
         @echo "================================================================"
 
@@ -233 +234 @@
         $(FLEX) $(FLEXFLAGS) instrument.l
 
-test: test_@PACKAGE_TARNAME@
+test: test_@MCCODE_TARNAME@
 
 test_mcstas: mcrun.fixpl
@@ -241 +242 @@
         export PATH=${PWD}:$$PATH; export MCSTAS=${PWD}/McXtraceTest; export PERL5LIB=../lib/tools/perl; ln -s mxrun.fixpl mcrun; ./mxrun.mxfixpl --test; rm mcrun
 
-uninstall: uninstall_@PACKAGE_TARNAME@
+uninstall: uninstall_@MCCODE_TARNAME@
         rm -rf $(libdir_mccode)
 
 uninstall_mcstas: 
-        cd $(bindir); rm -f $(BINOBJS_@PACKAGE_TARNAME@)
+        cd $(bindir); rm -f $(BINOBJS_@MCCODE_TARNAME@)
         rm -f $(PERLBIN)
 
 uninstall_mcxtrace: 
-        cd $(bindir); rm -f $(BINOBJS_@PACKAGE_TARNAME@)
+        cd $(bindir); rm -f $(BINOBJS_@MCCODE_TARNAME@)
         rm -f $(MXPERLBIN)
 
 reconfigure:
         cd $(libdir_mccode)/tools/perl/
-        $(libdir_mccode)/tools/perl/@PACKAGE_TARNAME@_reconfigure
-
+        $(libdir_mccode)/tools/perl/mccode_reconfigure
+

trunk/src/cogen.c

@@ -1520 +1520 @@
   cout(" */\n");
   cout("");
-  coutf("#define MCCODE_VERSION \"%s\"", MCCODE_VERSION);
+  coutf("#define MCCODE_STRING \"%s\"", MCCODE_STRING);
   cogen_runtime(instr);
   cogen_decls(instr);

trunk/src/cogenmx.c

@@ -1523 +1523 @@
   cout(" */\n");
   cout("");
-  coutf("#define MCCODE_VERSION \"%s\"", MCCODE_VERSION);
+  coutf("#define MCCODE_STRING \"%s\"", MCCODE_STRING);
   cogen_runtime(instr);
   cogen_decls(instr);

trunk/src/instrument.y

@@ -1492 +1492 @@
 print_usage(void)
 {
+  fprintf(stderr, MCCODE_NAME " version " MCCODE_STRING " (" MCCODE_DATE ")\n");
   fprintf(stderr, "Usage:\n"
-    "  mcstas [-o file] [-I dir1 ...] [-t] [-p] [-v] "
+    "  " MCCODE_NAME " [-o file] [-I dir1 ...] [-t] [-p] [-v] "
     "[--no-main] [--no-runtime] [--verbose] file\n");
   fprintf(stderr, "      -o FILE --output-file=FILE Place C output in file FILE.\n");
@@ -1510 +1511 @@
   fprintf(stderr, "  Use 'mcgui' to run the McStas GUI.\n");  
   fprintf(stderr, "SEE ALSO: mcrun, mcplot, mcdisplay, mcresplot, mcstas2vitess, mcgui, mcformat, mcdoc\n");
-  fprintf(stderr, "DOC:      Please visit " PACKAGE_BUGREPORT "\n");
+  fprintf(stderr, "DOC:      Please visit " MCCODE_BUGREPORT "\n");
   exit(1);
 }
@@ -1517 +1518 @@
 static void
 print_version(void)
-{ /* MOD: E. Farhi Sep 20th, 2001 version number */
-  printf(PACKAGE_NAME " version " PACKAGE_VERSION "\n"
+{ 
+  printf(MCCODE_NAME " version " MCCODE_VERSION " (" MCCODE_DATE ")\n"
     "Copyright (C) Risoe National Laboratory, 1997-2010\n"
     "Additions (C) Institut Laue Langevin, 2003-2010\n"
@@ -1673 +1674 @@
   }
   if(file == NULL)
-    fatal_error(PACKAGE_NAME ": Instrument definition file `%s' not found\n",
+    fatal_error(MCCODE_NAME ": Instrument definition file `%s' not found\n",
     instr_current_filename);
   instrument_definition->quoted_source =
     str_quote(instrument_definition->source);
   if (verbose) {
-    fprintf(stderr, PACKAGE_NAME " version " PACKAGE_VERSION "\n");
+    fprintf(stderr, MCCODE_NAME " version " MCCODE_VERSION "\n");
     fprintf(stderr, "Analyzing file      %s\n", instrument_definition->quoted_source);
   }
@@ -1689 +1690 @@
   if(err != 0 || error_encountered != 0)
   {
-    print_error(PACKAGE_NAME ": Errors encountered during parse of %s.\n", instr_current_filename);
+    print_error(MCCODE_NAME ": Errors encountered during parse of %s.\n", instr_current_filename);
     exit(1);
   }

trunk/src/mcconfig.pl

@@ -161 +161 @@
 $plotter="PGPLOT";
 print STDOUT "The plotter is $plotter\n";
-my $file = "mcstas_config.perl";
-if (not -f $file) { $file = "lib/tools/perl/mcstas_config.perl"; }
-if (not -f $file) { $file = "../lib/tools/perl/mcstas_config.perl"; }
-if (not -f $file) { $file = "$ENV{'MCSTAS'}/tools/perl/mcstas_config.perl"; }
+my $file = "mccode_config.perl";
+if (not -f $file) { $file = "lib/tools/perl/mccode_config.perl"; }
+if (not -f $file) { $file = "../lib/tools/perl/mccode_config.perl"; }
+if (not -f $file) { $file = "$ENV{'MCSTAS'}/tools/perl/mccode_config.perl"; }
 my $fid = open(READ,"<$file");
 if (not $fid) { die "Could not open config file $file\n"; }

trunk/src/mcdaemon.pl

@@ -54 +54 @@
 use lib $MCSTAS::perl_dir;
 use lib $MCSTAS::perl_modules;
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl") {
+  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl";
 }
 

trunk/src/mcdisplay.pl

@@ -67 +67 @@
 use lib $MCSTAS::perl_dir;
 use lib $MCSTAS::perl_modules;
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl") {
+  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl";
 }
 
@@ -1306 +1306 @@
   print STDERR "1) Install pgplot + pgperl packages (Unix/Linux/Cygwin) \n";
   print STDERR "2) Rerun mcdisplay with -p/--plotter set to Scilab/Matlab \n";
-  print STDERR "3) Modify $MCSTAS::perl_dir/mcstas_config.perl\n";
+  print STDERR "3) Modify $MCSTAS::perl_dir/mccode_config.perl\n";
   print STDERR "   to set a different default plotter\n\n";
   print STDERR "******************************************************\n\n";

trunk/src/mcdoc.pl

@@ -31 +31 @@
 
 use lib $MCSTAS::perl_dir;
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl") {
+  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl";
 }
 
@@ -587 +587 @@
 
 require File::Temp;
-if ($out_file eq "") {
+if ($out_file eq "" && $browser ne "text") {
   ($fh, $out_file) = File::Temp::tempfile("mcdoc_tmpXXXXXX", SUFFIX => '.html');
   if (not defined $fh) { $out_file=""; }
 }
-if ($out_file eq "") { $out_file="index.html"; }
+if ($out_file eq "" && $browser ne "text") { $out_file="index.html"; }
 
 if ($show_website) {
@@ -632 +632 @@
 my %section_headers;
 
-if (not $is_single_file) {
+if ((not $is_single_file) && ($browser ne "text") && ($out_file ne "")) {
   # Open the local documentation file
   $filehandle = new FileHandle;
@@ -644 +644 @@
       $filehandle = 0; # will not write the catalog
       print STDERR "mcdoc: Could not open $out_file for writing.\n";
+    } else {
+      print "mcdoc: Opening $out_file\n";
     }
   } else {
@@ -713 +715 @@
 if (-f $out_file) {
     if ($browser ne "text") {
-        # In case of multiple matches, create table of results:
-        if (@valid_names > 1) { 
-            require File::Temp;
-            my $searchfile;
-            ($filehandle, $searchfile) = File::Temp::tempfile("McDoc_XXXX", SUFFIX => '.html', UNLINK => 1);
-            open($filehandle, ">$searchfile") || die "Could not write to search output file\n";
-            add_comp_search_html($file, $filehandle, @valid_names);
-            html_main_end($filehandle, $toolbar);
-            close($filehandle);
-            $out_file = "$searchfile";
-        } 
-        
-        # open the index.html
-        my $cmd = "$MCSTAS::mcstas_config{'BROWSER'} $out_file";
-        print "mcdoc: Starting $cmd\n"; system("$cmd\n");
-    }
-}
+      # In case of multiple matches, create table of results:
+      if (@valid_names > 1) { 
+          require File::Temp;
+          my $searchfile;
+          ($filehandle, $searchfile) = File::Temp::tempfile("McDoc_XXXX", SUFFIX => '.html', UNLINK => 1);
+          open($filehandle, ">$searchfile") || die "Could not write to search output file\n";
+          add_comp_search_html($file, $filehandle, @valid_names);
+          html_main_end($filehandle, $toolbar);
+          close($filehandle);
+          $out_file = "$searchfile";
+      } 
+
+      # open the index.html
+      my $cmd = "$MCSTAS::mcstas_config{'BROWSER'} $out_file";
+      print "mcdoc: Starting $cmd\n"; system("$cmd\n");
+    }
+}

trunk/src/mcformatgui.pl

@@ -55 +55 @@
 use lib $MCSTAS::perl_dir;
 use lib $MCSTAS::perl_modules;
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl") {
+  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl";
 }
 

trunk/src/mcgui.pl

@@ -49 +49 @@
 use lib $MCSTAS::perl_dir;
 use lib $MCSTAS::perl_modules;
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl") {
+  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl";
 }
 
@@ -580 +580 @@
   
   if (-d $ENV{"HOME"}) {
-    if (!(-d $ENV{"HOME"}."/.mcstas")) {
-      mkdir $ENV{"HOME"}."/.mcstas";
-    }
-    $initdir = $ENV{"HOME"}."/.mcstas/";
+    if (!(-d $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'})) {
+      mkdir $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'};
+    }
+    $initdir = $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'};
   } else {
     $initdir = $MCSTAS::perl_dir
@@ -590 +590 @@
                                 -title => "Select preference file name",
                                 -initialdir => $initdir,
-                                -initialfile => "mcstas_config.perl");
+                                -initialfile => "mccode_config.perl");
   if ($file) { save_config($w,$file); }
 }
@@ -604 +604 @@
 
   my $fh = new FileHandle;
-  my $fid = open($fh, "<", "$MCSTAS::perl_dir/mcstas_config.perl");
+  my $fid = open($fh, "<", "$MCSTAS::perl_dir/mccode_config.perl");
   while (<$fh>) {
     if (!$found_head) {
@@ -1809 +1809 @@
       $cmdwin->insert('end',
 "Warning: No MPI/grid machine list. Running locally.
-  Define $ENV{'HOME'}/.mcstas/hosts
+  Define ".$ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/hosts
   or $MCSTAS::sys_dir/tools/perl/hosts
   or use option --machines=<file>\n");

trunk/src/mcplot.pl

@@ -60 +60 @@
 use lib $MCSTAS::perl_dir;
 use lib $MCSTAS::perl_modules;
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl") {
+  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl";
 }
 
@@ -269 +269 @@
     print STDERR "1) Install pgplot + pgperl packages (Unix/Linux/Cygwin) \n";
     print STDERR "2) Rerun mcplot with -p/--plotter set to Scilab/Matlab/VRML \n";
-    print STDERR "3) Modify $MCSTAS::perl_dir/mcstas_config.perl\n";
+    print STDERR "3) Modify $MCSTAS::perl_dir/mccode_config.perl\n";
     print STDERR "   to set a different default plotter\n";
     print STDERR "4) Set your env variable MCSTAS_FORMAT to set the default\n";

trunk/src/mcrun.pl

@@ -31 +31 @@
 BEGIN {
   # default configuration (for all high level perl scripts)
+
   if($ENV{"MCSTAS"}) {
     $MCSTAS::sys_dir = $ENV{"MCSTAS"};
@@ -48 +49 @@
 use lib $MCSTAS::perl_dir;
 use lib $MCSTAS::perl_modules;
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl") {
+  require $ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/mccode_config.perl";
 }
 
@@ -230 +231 @@
       if (! -e $MCSTAS::mcstas_config{'HOSTFILE'}) {
         print STDERR "mcrun: No MPI/grid machine list. Running locally.
-  Define $ENV{'HOME'}/.mcstas/hosts
+  Define ".$ENV{"HOME"}."/.".$MCSTAS::mcstas_config{'MCCODE'}."/hosts
   or $MCSTAS::sys_dir/tools/perl/hosts
   or use option --machines=<file>\n";

trunk/src/mcstas2vitess.pl

@@ -37 +37 @@
 use FileHandle;
 
-require "mcstas_config.perl";
+require "mccode_config.perl";
 
 # Overload with user's personal config
-if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.mcstas/mcstas_config.perl") {
-  require $ENV{"HOME"}."/.mcstas/mcstas_config.perl";
+if ($ENV{"HOME"} && -e $ENV{"HOME"}."/.mcstas/mccode_config.perl") {
+  require $ENV{"HOME"}."/.mcstas/mccode_config.perl";
 }
 

trunk/src/port.h.in

@@ -49 +49 @@
 #ifndef MCSTAS
 #ifdef WIN32
-#define MCSTAS "C:\\@PACKAGE_TARNAME@\\lib"
+#define MCSTAS "C:\\@MCCODE_TARNAME@\\lib"
 #else  /* !WIN32 */
 #ifdef MAC
-#define MCSTAS ":@PACKAGE_TARNAME@:lib" /* ToDo: What to put here? */
+#define MCSTAS ":@MCCODE_TARNAME@:lib" /* ToDo: What to put here? */
 #else  /* !MAC */
-#define MCSTAS "/usr/local/lib/@PACKAGE_TARNAME@"
+#define MCSTAS "/usr/local/lib/@MCCODE_TARNAME@"
 #endif /* !MAC */
 #endif /* !WIN32 */
@@ -60 +60 @@
 
 #ifdef WIN32
-#define PACKAGE_BUGREPORT "www.@PACKAGE_TARNAME@.org"
+#define MCCODE_BUGREPORT "www.@MCCODE_TARNAME@.org"
 #ifndef HAVE_STRCASECMP
 #define HAVE_STRCASECMP

trunk/support/common/Makefile.in

@@ -30 +30 @@
 prefix = @prefix@
 srcdir = @srcdir@
-mc_libdir = @prefix@/lib/@PACKAGE_TARNAME@/
+mc_libdir = @prefix@/lib/@MCCODE_TARNAME@/
 G77  = @G77@
 
 PERL = @PERL@
 PERLBIN=`which perl`
-PERL5LIB=@prefix@/lib/@PACKAGE_TARNAME@/tools/perl/modules:`perl -e "print join(\":\", @INC);"`
+PERL5LIB=@prefix@/lib/@MCCODE_TARNAME@/tools/perl/modules:`perl -e "print join(\":\", @INC);"`
 PGPLOT_DIR=@prefix@/pgplot
 LD_LIBRARY_PATH=${PGPLOT_DIR}
@@ -52 +52 @@
         # install Math-Amoeba
         cd $(srcdir)/Perl/Math-Amoeba-0.04 && $(PERL) Makefile.PL LIB=$(mc_libdir)/tools/perl/modules PREFIX=$(mc_libdir)/tools/perl/modules && make && make install
-        @echo "Installed Proc-Simple Tk-CodeText Math-Amoeba perl modules in @prefix@/lib/@PACKAGE_TARNAME@/tools/perl/modules"
+        @echo "Installed Proc-Simple Tk-CodeText Math-Amoeba perl modules in @prefix@/lib/@MCCODE_TARNAME@/tools/perl/modules"
 
 perl-PGPLOT:
         $(srcdir)/../../mkinstalldirs  $(mc_libdir)/tools/perl/modules
         # install F77 
-        cd $(srcdir)/Perl/ExtUtils-F77-1.16 && perl Makefile.PL PREFIX=@prefix@/lib/@PACKAGE_TARNAME@/tools/perl/modules LIB=@prefix@/lib/@PACKAGE_TARNAME@/tools/perl/modules && make && make install
+        cd $(srcdir)/Perl/ExtUtils-F77-1.16 && perl Makefile.PL PREFIX=@prefix@/lib/@MCCODE_TARNAME@/tools/perl/modules LIB=@prefix@/lib/@MCCODE_TARNAME@/tools/perl/modules && make && make install
         # install perl-PGPLOT
         cd $(srcdir)/Perl/PGPLOT-2.20
@@ -64 +64 @@
                   mv $(srcdir)/Perl/PGPLOT-2.20/Makefile.PL.new $(srcdir)/Perl/PGPLOT-2.20/Makefile.PL; \
         fi
-        cd $(srcdir)/Perl/PGPLOT-2.20 && export PERL5LIB=${PERL5LIB} && perl Makefile.PL PREFIX=@prefix@/lib/@PACKAGE_TARNAME@/tools/perl/modules LIB=@prefix@/lib/@PACKAGE_TARNAME@/tools/perl/modules && make && make install
-        @echo "Installed perl-PGPLOT modules in @prefix@/lib/@PACKAGE_TARNAME@/tools/perl/modules"
+        cd $(srcdir)/Perl/PGPLOT-2.20 && export PERL5LIB=${PERL5LIB} && perl Makefile.PL PREFIX=@prefix@/lib/@MCCODE_TARNAME@/tools/perl/modules LIB=@prefix@/lib/@MCCODE_TARNAME@/tools/perl/modules && make && make install
+        @echo "Installed perl-PGPLOT modules in @prefix@/lib/@MCCODE_TARNAME@/tools/perl/modules"
 
 install-pgplot: compile-pgplot perl-PGPLOT

trunk/xlib/share/mcxtrace-r.h

@@ -26 +26 @@
 *   extern MCNUM  mcAbsorbProp[];
 *   extern MCNUM  mcScattered;
-*   #define MCCODE_VERSION "the McXtrace version"
+*   #define MCCODE_STRING "the McXtrace version"
 *
 * Usage: Automatically embbeded in the c code.
@@ -161 +161 @@
   } while(0)
 
+#ifdef DEBUG
+#define mcDEBUG_STATE(x,y,z,kx,ky,kz,phi,Ex,Ey,Ez,p) if(!mcdotrace); else \
+  printf("STATE: %g, %g, %g, %g, %g, %g, %g, %g, %g, %g, %g\n", \
+      x,y,z,kx,ky,kz,phi,Ex,Ey,Ez,p);
+#define mcDEBUG_SCATTER(x,y,z,kx,ky,kz,phi,Ex,Ey,Ez,p) if(!mcdotrace); else \
+  printf("SCATTER: %g, %g, %g, %g, %g, %g, %g, %g, %g, %g, %g\n", \
+      x,y,z,kx,ky,kz,phi,Ex,Ey,Ez,p);
+#endif
+
 void mccoordschange(Coords a, Rotation t, double *x, double *y, double *z,
     double *kx, double *ky, double *kz);