Changeset 1349


Ignore:
Timestamp:
Jan 5, 2011, 12:20:17 PM (13 years ago)
Author:
garnier
Message:

update

Location:
trunk
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/CVS/Entries

    r1337 r1349  
    11D/scripts////
    22D/sys////
    3 /G4UI_BUILD.gmk/1.5/Thu Sep 30 06:01:23 2010//Tgeant4-09-04-beta-01
    4 /G4UI_USE.gmk/1.15/Thu Sep 30 06:01:23 2010//Tgeant4-09-04-beta-01
    5 /G4VIS_BUILD.gmk/1.22/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-beta-01
    6 /G4VIS_USE.gmk/1.28/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-beta-01
    7 /History/1.379/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-beta-01
    8 /analysis.gmk/1.18/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-beta-01
    9 /architecture.gmk/1.121/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    10 /binmake.gmk/1.146/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    11 /common.gmk/1.54/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    12 /globlib.gmk/1.29/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    13 /interactivity.gmk/1.12/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    14 /liblist.c/1.21/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    15 /moc.gmk/1.3/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    16 /win32def.c/1.3/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
     3/G4UI_BUILD.gmk/1.5/Thu Sep 30 06:01:23 2010//Tgeant4-09-04-ref-00
     4/G4UI_USE.gmk/1.15/Thu Sep 30 06:01:23 2010//Tgeant4-09-04-ref-00
     5/G4VIS_BUILD.gmk/1.22/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-ref-00
     6/G4VIS_USE.gmk/1.28/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-ref-00
     7/analysis.gmk/1.18/Thu Sep 30 06:01:24 2010//Tgeant4-09-04-ref-00
     8/architecture.gmk/1.125/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     9/binmake.gmk/1.149/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     10/common.gmk/1.54/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
     11/globlib.gmk/1.30/Tue Oct  5 15:14:30 2010//Tgeant4-09-04-ref-00
     12/interactivity.gmk/1.12/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-ref-00
     13/liblist.c/1.22/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     14/moc.gmk/1.3/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-ref-00
     15/win32def.c/1.3/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-ref-00
     16/History/1.400/Wed Dec 22 16:28:40 2010//

  • trunk/config/CVS/Tag

    r1331 r1349  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/config/History

    r1337 r1349  
    1 cvs log $Id: History,v 1.379 2010/06/11 10:02:27 gunter Exp $
     1cvs log $Id: History,v 1.400 2010/12/22 16:28:40 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     ----------------------------------------------------------
    1818
    19 11 June 2010  Gunter Folger   (config-V09-03-05)
    20 - Increase stack size on Windows, in sys/WIN-VC add a /STACK:8368128
    21    (ie. 8MB) option to LDFLAGS; Needed by some Chips based
    22    examples and tests.
     1922th December 2010  Laurent Garnier
     20- Darwin-g++.gmk add fix to not mix OGL X11 and framework
     21
     228th December 2010  Gunter Folger   (config-V09-03-19)
     23- Updated linux-icc to suppress warning when linking to shared libs
     24
     2525th November 2010  Gabriele Cosmo (config-V09-03-18)
     26- Updated internal Configure scripts for adding new data module G4PIIDATA.
     27
     2824th November 2010  Gabriele Cosmo (config-V09-03-17 & V09-03-16)
     29- Added hadronic/models/lend module to binmake.gmk and cleanup of obsolete
     30  include paths.
     31
     3219th November 2010  Gabriele Cosmo (config-V09-03-15)
     33- Added electromagnetic/pii module to binmake.gmk.
     34
     354th November 2010  Mike Kelsey (config-V09-03-14)
     36- Fixed typo in OGLLIBS definition for MacOSX Leopard.
     37
     382nd November 2010  Gabriele Cosmo (config-V09-03-13)
     39- Replace use of strcat() with more secure strncat() in liblist.c, and
     40  protected uses of strcpy().
     41- Updated scripts for Configure, to allow for parallel builds (B.Morgan).
     42
     431st November 2010  Gabriele Cosmo (config-V09-03-12)
     44- Restore positional qualifier for LDFLAGS in architecture.gmk to allow for
     45  explicit settings in user applications.
     46
     4726th October 2010  Gabriele Cosmo (config-V09-03-11)
     48- Explicitly include -L$(OGLHOME)/lib -lGLU -lGL to OGLLIBS in Darwin-g++.gmk
     49  to resolve dynamic link problem on Mac when opening X11 GL scene viewers.
     50  Moved block of OGLLIBS for X11 to correct 'else' condition.
     51
     5215th October 2010  Gabriele Cosmo (config-V09-03-10)
     53- More refinements to Darwin-g++ to correct and simplify Qt4 setup.
     54
     5512th October 2010  Gabriele Cosmo (config-V09-03-09)
     56- Force definition of LDFLAGS in architecture.gmk to avoid occasional fatal
     57  clashes with settings in user's environment.
     58
     5910th October 2010  Gabriele Cosmo
     60- Removed obsolete Qt3 setup for Darwin-g++, Linux-g++ and WIN32-VC.
     61
     625th October 2010  Laurent Garnier (config-V09-03-08)
     63- Darwin-g++.gmk: fixed mix between X11 OpenGL and Native OpenGL on mac 10.6.
     64
     6530th September 2010  Gabriele Cosmo (config-V09-03-07)
     66- Added 'obj' target to globlib.gmk to allow for just creation of object files.
     67
     6823rd August 2010  Gabriele Cosmo (config-V09-03-06)
     69- Simplified QTLIBPATH setup in Linux-g++.gmk.
     70
     7111th June 2010  Gunter Folger (config-V09-03-05)
     72- Increased stack size on Windows, in sys/WIN-VC added option /STACK:8368128
     73  (i.e. 8MB) option to LDFLAGS; needed by some CHIPS-based examples and tests.
    2374
    24757th June 2010  Gabriele Cosmo (config-V09-03-04)

  • trunk/config/architecture.gmk

    r1303 r1349  
    1 # $Id: architecture.gmk,v 1.121 2009/11/18 17:27:38 gcosmo Exp $
     1# $Id: architecture.gmk,v 1.125 2010/11/24 10:54:13 gcosmo Exp $
    22# ------------------------------------------------------------------------
    33#       GEANT 4 - Architecture configuration script for GNU Make

  • trunk/config/binmake.gmk

    r1337 r1349  
    1 # $Id: binmake.gmk,v 1.146 2010/06/07 09:01:10 gcosmo Exp $
     1# $Id: binmake.gmk,v 1.149 2010/11/23 13:21:37 gcosmo Exp $
    22# ----------------------------------------------------------
    33# Script defining rules and paths for making binaries.
    … …  
    55# ----------------------------------------------------------
    66
    7 ifndef LDFLAGS
     7ifndef G4DUMMY_VARIABLE
    88  include $(G4INSTALL)/config/architecture.gmk
    99endif
    … …  
    7878              -I$(G4BASE)/processes/electromagnetic/lowenergy/include \
    7979              -I$(G4BASE)/processes/electromagnetic/highenergy/include \
     80              -I$(G4BASE)/processes/electromagnetic/pii/include \
    8081              -I$(G4BASE)/processes/electromagnetic/polarisation/include \
    8182              -I$(G4BASE)/processes/hadronic/cross_sections/include \
    … …  
    103104              -I$(G4BASE)/processes/hadronic/models/de_excitation/util/include \
    104105              -I$(G4BASE)/processes/hadronic/models/em_dissociation/include \
    105               -I$(G4BASE)/processes/hadronic/models/general_finalstate/include \
    106106              -I$(G4BASE)/processes/hadronic/models/high_energy/include \
    107107              -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
    108108              -I$(G4BASE)/processes/hadronic/models/incl/include \
    109               -I$(G4BASE)/processes/hadronic/models/inucl/include \
    110109              -I$(G4BASE)/processes/hadronic/models/isotope_production/include \
     110              -I$(G4BASE)/processes/hadronic/models/lend/include \
    111111              -I$(G4BASE)/processes/hadronic/models/lll_fission/include \
    112112              -I$(G4BASE)/processes/hadronic/models/low_energy/include \
    … …  
    120120              -I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \
    121121              -I$(G4BASE)/processes/hadronic/models/qmd/include \
    122               -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/body/include \
    123               -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/util/include \
    124122              -I$(G4BASE)/processes/hadronic/models/radioactive_decay/include \
    125               -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/include \
    126               -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/uplusplus/include \
    127123              -I$(G4BASE)/processes/hadronic/models/rpg/include \
    128124              -I$(G4BASE)/processes/hadronic/models/theo_high_energy/include \

  • trunk/config/common.gmk

    r1045 r1349  
    114114        @echo Making dependency for file $< ...
    115115        @if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR)  ;fi
    116         @set -e;\
    117116        g++ $(GPPFLAGS) $(CPPFLAGS) -w $< |\
    118117        sed 's!$*\.o!$(G4TMPDIR)/& $@!' >$@;\

  • trunk/config/globlib.gmk

    r1045 r1349  
    1 # $Id: globlib.gmk,v 1.29 2009/02/26 16:40:40 gcosmo Exp $
     1# $Id: globlib.gmk,v 1.30 2010/09/30 09:04:01 gcosmo Exp $
    22# --------------------------------------------------------------
    33# Script for compound libraries.  Gabriele Cosmo, 25/6/98.
    … …  
    1212G4LIBDIR = $(G4LIB)/$(G4SYSTEM)
    1313
    14 .PHONY : all glob global objs includes clean clean_libs wipe_libs
     14.PHONY : all glob global obj objs includes clean clean_libs wipe_libs
    1515
    1616all: makesub
    … …  
    9191endif
    9292
     93obj:
     94        @for dir in $(SUBDIRS); \
     95          do (cd $$dir; $(MAKE) -q obj && ok=yes; \
     96            if [ $$ok ]; \
     97            then echo Nothing to be done for lib$(name) in $$dir/.; \
     98            else $(MAKE) obj; \
     99            fi; ) \
     100          done
     101
    93102objs:
    94103        @for dir in $(SUBDIRS); \

  • trunk/config/liblist.c

    r850 r1349  
    1 /* $Id: liblist.c,v 1.21 2008/05/20 13:33:34 gunter Exp $ */
     1/* $Id: liblist.c,v 1.22 2010/11/02 09:20:42 gcosmo Exp $ */
    22
    33/*
    … …  
    7272                             strlen(entry->d_name)+2)*sizeof(char));
    7373      strcpy(buffer,directory);
    74       strcat(buffer,"/");
    75       strcat(buffer,entry->d_name);
     74      strncat(buffer,"/",1);
     75      strncat(buffer,entry->d_name,strlen(entry->d_name));
    7676      s=stat(buffer,&status);
    7777      if(s==0)
    … …  
    287287            }
    288288          libmapPtr->trigger=(char*)malloc(TRIGSIZE);
     289          if(strlen(ptr)>TRIGSIZE)
     290          {
     291            fprintf(stderr,"  ERROR: String overflow for: %s\n", ptr);
     292            exit(1);
     293          }
    289294          strcpy(libmapPtr->trigger,ptr);
    290295          ptr=strtok(NULL,"/");
    291296          while(ptr&&strcmp(ptr,"GNUmakefile"))
    292297            {
    293               strcat(libmapPtr->trigger,"/");
    294               strcat(libmapPtr->trigger,ptr);
     298              strncat(libmapPtr->trigger,"/",1);
     299              strncat(libmapPtr->trigger,ptr,strlen(ptr));
    295300              ptr=strtok(NULL,"/");
    296301            }
    … …  
    339344      for(libmapPtr=libmap;libmapPtr;libmapPtr=libmapPtr->next)
    340345        {
    341           strcpy(workbuf,libmapPtr->lib);
     346          if(strlen(libmapPtr->lib)>256)
     347          {
     348            fprintf(stderr,"  ERROR: String overflow for: %s\n", libmapPtr->lib);
     349            exit(1);
     350          }
     351          strcpy(workbuf,libmapPtr->lib);
    342352          /* Add trailing "/" to distinguish track/ and tracking/, etc. */
    343           strcat(workbuf,"/");
     353          strncat(workbuf,"/",1);
    344354          if(strstr(ptr,workbuf)) break;
    345355        }
    … …  
    367377                {
    368378                  /* Look for trigger string. */
    369                   strcpy(workbuf,libmapPtr->trigger);
    370                   strcat(workbuf,"/include");
     379                  if(strlen(libmapPtr->trigger)>256)
     380                  {
     381                    fprintf(stderr,"  ERROR: String overflow for: %s\n", libmapPtr->trigger);
     382                    exit(1);
     383                  }
     384                  strcpy(workbuf,libmapPtr->trigger);
     385                  strncat(workbuf,"/include",8);
    371386                  ptr=strstr(bufferPtr,workbuf);
    372387                  if(ptr && (userLibmapPtr != libmapPtr))
    … …  
    388403                     from .ddl files and places them in a temporary
    389404                     directory. */
     405                  if(strlen(libmapPtr->lib)>256)
     406                  {
     407                    fprintf(stderr,"  ERROR: String overflow for: %s\n", libmapPtr->lib);
     408                    exit(1);
     409                  }
    390410                  strcpy(workbuf,libmapPtr->lib);
    391                   strcat(workbuf,"/");
     411                  strncat(workbuf,"/",1);
    392412                  ptr=strstr(bufferPtr,workbuf);
    393413                  if(ptr && (userLibmapPtr != libmapPtr))

  • trunk/config/scripts/CVS/Entries

    r1337 r1349  
    1 /GNUmakefile/1.8/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    2 /binmake.gmk/1.11/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-beta-01
    3 /env.csh.SH/1.49/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
    4 /env.sh.SH/1.54/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
    5 /install.sh.SH/1.45/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
    6 /move.sh.SH/1.18/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-beta-01
     1/GNUmakefile/1.8/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-ref-00
     2/binmake.gmk/1.11/Thu Sep 30 06:01:25 2010//Tgeant4-09-04-ref-00
     3/env.csh.SH/1.50/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     4/env.sh.SH/1.55/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     5/install.sh.SH/1.46/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     6/move.sh.SH/1.18/Thu Sep 30 06:01:26 2010//Tgeant4-09-04-ref-00
    77D

  • trunk/config/scripts/CVS/Tag

    r1331 r1349  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/config/scripts/env.csh.SH

    r1337 r1349  
    4242unsetenv  G4REALSURFACEDATA
    4343unsetenv  G4NEUTRONXSDATA
     44unsetenv  G4PIIDATA
    4445
    4546unsetenv  G4LIB
    … …  
    170171endif
    171172
     173#+
     174if ( X$g4piidata != X ) then
     175    setenv G4PIIDATA "$g4piidata"
     176    echo "On this machine the G4PIIDATA=\$G4PIIDATA"
     177endif
     178
     179
    172180
    173181#

  • trunk/config/scripts/env.sh.SH

    r1337 r1349  
    4242unset  G4REALSURFACEDATA
    4343unset  G4NEUTRONXSDATA
     44unset  G4PIIDATA
    4445
    4546unset  G4LIB
    … …  
    198199    if [ X\$g4non_display = X ] ; then
    199200        echo "On this machine the G4NEUTRONXSDATA=\$G4NEUTRONXSDATA"
     201    fi
     202fi
     203
     204#+
     205if [ X$g4piidata != X ] ; then
     206    G4PIIDATA="$g4piidata"
     207    export G4PIIDATA
     208    if [ X\$g4non_display = X ] ; then
     209        echo "On this machine the G4PIIDATA=\$G4PIIDATA"
    200210    fi
    201211fi

  • trunk/config/scripts/install.sh.SH

    r1337 r1349  
    630630
    631631if test -f \$G4INSTALL/config/scripts/GNUmakefile.db ; then
    632 mv \$G4INSTALL/config/scripts/GNUmakefile.db \$G4LIB/\$G4SYSTEM/GNUmakefile.db.bac
     632    mv \$G4INSTALL/config/scripts/GNUmakefile.db \$G4LIB/\$G4SYSTEM/GNUmakefile.db.bac
    633633fi
    634634
    … …  
    642642echo "Starting build..."
    643643echo ""
     644
     645echo "Cleaning up $g4conf/g4make.log"
     646rm -rf $g4conf/g4make.log
     647
    644648cd $g4install/source
    645 #echo `pwd`
     649
     650if test $g4make_jobs -gt 1 ; then
     651    $g4make obj -j $g4make_jobs
     652fi
    646653
    647654# There is no env!
    648655if [ X$g4global = Xy ] ; then
    649 echo ""
    650 rm -rf $g4conf/g4make.log
    651 $g4make global 2>&1 | tee $g4conf/g4make.log
     656    echo "Building global libraries..."
     657    $g4make global 2>&1 | tee $g4conf/g4make.log
    652658fi
    653659
    654660# There is env for binaries - for User: should be set in env.[c]sh!
    655661if [ X$g4granular = Xy ] ; then
    656 G4LIB_USE_GRANULAR=1
    657 export G4LIB_USE_GRANULAR
    658 rm -rf $g4conf/g4make.log
    659 $g4make 2>&1 | tee $g4conf/g4make.log
     662    echo "Building granular libraries..."
     663    G4LIB_USE_GRANULAR=1
     664    export G4LIB_USE_GRANULAR
     665    $g4make 2>&1 | tee $g4conf/g4make.log
    660666fi
    661667
    662668if [ X$g4lib_build_dll = Xy ] ; then
    663 echo ""
    664 rm -rf $g4conf/g4make.log
    665 $g4make dll 2>&1 | tee $g4conf/g4make.log
     669    echo "Building WIN32 DLLs..."
     670    $g4make dll 2>&1 | tee $g4conf/g4make.log
    666671fi
    667672
    668673if [ X$g4lib_build_dyn = Xy ] ; then
    669 echo ""
    670 rm -rf $g4conf/g4make.log
    671 $g4make global G4LIB_BUILD_SHARED=1 2>&1 | tee $g4conf/g4make.log
     674    echo ""
     675    rm -rf $g4conf/g4make.log
     676    $g4make global G4LIB_BUILD_SHARED=1 2>&1 | tee $g4conf/g4make.log
    672677fi
    673678
    674679# Check for errors in log file
    675680if test -f \$g4conf/g4make.log ; then
    676 
    677 # There are two (at least) shells 'sh' and 'bash' with
    678 # different arithmetic expansion...So we are doing it by 'text'
    679 # in two steps...
     681    # There are two (at least) shells 'sh' and 'bash' with
     682    # different arithmetic expansion...So we are doing it by 'text'
     683    # in two steps...
    680684 
    681 err=\`grep " Error " $g4conf/g4make.log | wc -w\`
    682 int=\`grep " Interrupt " $g4conf/g4make.log | wc -w\`
    683 stp=\`grep Stop\. $g4conf/g4make.log | wc -w\`
    684 
    685 err2=\`echo \$err\`
    686 int2=\`echo \$int\`
    687 stp2=\`echo \$stp\`
    688 
    689 if [ X\$err2 = X0 -a X\$int2 = X0 ] ; then
    690 echo ""
    691 echo "####################################################"
    692 echo "# Your Geant4 installation seems to be successful!  "
    693 echo "# To be sure please have a look into the log file:  "
    694 echo "# $g4conf/g4make.log                                "
    695 echo "####################################################"
    696 echo ""
     685    err=\`grep " Error " $g4conf/g4make.log | wc -w\`
     686    int=\`grep " Interrupt " $g4conf/g4make.log | wc -w\`
     687    stp=\`grep Stop\. $g4conf/g4make.log | wc -w\`
     688
     689    err2=\`echo \$err\`
     690    int2=\`echo \$int\`
     691    stp2=\`echo \$stp\`
     692
     693    if [ X\$err2 = X0 -a X\$int2 = X0 ] ; then
     694        echo ""
     695        echo "####################################################"
     696        echo "# Your Geant4 installation seems to be successful!  "
     697        echo "# To be sure please have a look into the log file:  "
     698        echo "# $g4conf/g4make.log                                "
     699        echo "####################################################"
     700        echo ""
     701    else
     702        echo ""
     703        echo "############################################################"
     704        echo "# It looks like you had errors during Geant4 installation   "
     705        echo "# (or interrupted installation)!                            "
     706        echo "# Please check log file:                                    "
     707        echo "# $g4conf/g4make.log                                        "
     708        echo "############################################################"
     709        echo ""
     710    fi
    697711else
    698 echo ""
    699 echo "############################################################"
    700 echo "# It looks like you had errors during Geant4 installation   "
    701 echo "# (or interrupted installation)!                            "
    702 echo "# Please check log file:                                    "
    703 echo "# $g4conf/g4make.log                                        "
    704 echo "############################################################"
    705 echo ""
    706 fi
    707 else
    708 echo ""
    709 echo "############################################################"
    710 echo "# It looks like you had errors during Geant4 installation   "
    711 echo "# (or interrupted installation)!                            "
    712 echo "# You have no log file:                                     "
    713 echo "# $g4conf/g4make.log                                        "
    714 echo "############################################################"
    715 echo ""
     712    echo ""
     713    echo "############################################################"
     714    echo "# It looks like you had errors during Geant4 installation   "
     715    echo "# (or interrupted installation)!                                "
     716    echo "# You have no log file:                                         "
     717    echo "# $g4conf/g4make.log                                    "
     718    echo "############################################################"
     719    echo ""
    716720fi
    717721

  • trunk/config/sys/CVS/Entries

    r1337 r1349  
    1 /AIX-xlC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    2 /DEC-cxx.gmk/1.12/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    3 /Darwin-g++.gmk/1.42/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    4 /HP-aCC.gmk/1.11/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    5 /Linux-egcs.gmk/1.10/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    6 /Linux-g++.gmk/1.50/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    7 /Linux-icc.gmk/1.15/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    8 /SGI-CC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    9 /SUN-CC.gmk/1.19/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    10 /WIN32-VC.gmk/1.34/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    11 /WIN32-g++.gmk/1.18/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     1/AIX-xlC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     2/DEC-cxx.gmk/1.12/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     3/HP-aCC.gmk/1.11/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     4/Linux-egcs.gmk/1.10/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     5/Linux-g++.gmk/1.52/Tue Oct 26 09:07:48 2010//Tgeant4-09-04-ref-00
     6/Linux-icc.gmk/1.16/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     7/SGI-CC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     8/SUN-CC.gmk/1.19/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     9/WIN32-VC.gmk/1.35/Tue Oct 26 09:07:48 2010//Tgeant4-09-04-ref-00
     10/WIN32-g++.gmk/1.18/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     11/Darwin-g++.gmk/1.52/Thu Dec  9 13:54:13 2010//
    1212D

  • trunk/config/sys/CVS/Tag

    r1331 r1349  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

  • trunk/config/sys/Darwin-g++.gmk

    r1337 r1349  
    11#
    22# ------ MacOS-X ------
    3 #                                 MacOS 10.3 gcc-3.3
    4 #                                 MacOS 10.4 gcc-4.0
    5 #                                 MacOS 10.5 gcc-4.0
     3#                                 MacOS 10.6 gcc-4.2
    64#
    75# Original author: Helmut Burkhardt - CERN
    … …  
    6563  ifndef OGLHOME
    6664    OGLHOME  := /usr/X11R6
     65#   OGLHOME  := /System/Library/Frameworks/OpenGL.framework
    6766  endif
    6867  ifndef OGLFLAGS
    6968    OGLFLAGS  := -I$(OGLHOME)/include
     69#   OGLFLAGS := -I$(OGLHOME)/Headers
    7070  endif
    7171  ifndef OGLLIBS
    72     ifeq ($(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/'),9)
    73       # the following lines are for building on MacOSX 10.5 "Leopard"
    74       OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo "-L/usr/X11R6/lib -lGLU -lGL -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
     72    QTGLPATH  := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
     73    ifeq ($(QTGLPATH),/System/Library/Frameworks/OpenGL.framework)
     74      DARWIN_VERSION = $(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/')
     75      ifeq ($(DARWIN_VERSION),9)
     76        # the following lines are for building on MacOSX 10.5 "Leopard"
     77        OGLLIBS := -Wl,$(QTGLPATH)/Versions/A/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGLU -lGL
     78      else
     79        ifeq ($(DARWIN_VERSION),10)
     80          # the following lines are for building on MacOSX > 10.5
     81          OGLLIBS := -F/System/Library/Frameworks -framework OpenGL -framework AGL
     82          ifeq ($(G4VIS_USE_OPENGLX),1)
     83            OGLLIBS += -L$(OGLHOME)/lib -lGLU -lGL
     84          endif
     85        endif
     86      endif
    7587    else
    76 #      OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
    77       OGLLIBS   := -F/System/Library/Frameworks/ -framework OpenGL -framework AGL
     88      OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
    7889    endif
    7990  endif
    8091
    8192# ---- QT Setup block -------------------------------------------------------
     93
    8294  ifndef QTHOME
    83     QTHOME   := $(shell test -f /Library/Frameworks/Qt3Support.framework/Qt3Support && echo  "/Library/Frameworks" || echo "/sw")
     95    QTHOME := /Library/Frameworks
    8496  endif
    8597  ifndef QTMOC
    86    ifeq ($(QTHOME),/Library/Frameworks)
    87      QTMOC      := /usr/bin/moc
    88    else
    89      QTMOC      := $(QTHOME)/bin/moc
    90    endif
    91   endif
    92 
    93   QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
    94 
    95   ifndef QTFLAGS
    96     ifeq ($(QT_VERSION),4)
    97       QTFLAGS   := -I $(QTHOME)/QtCore.framework/Headers
    98       QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers
    99       QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
    100       QTFLAGS   += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     98    ifeq ($(QTHOME),/Library/Frameworks)
     99      QTMOC      := /usr/bin/moc
    101100    else
    102       QTFLAGS   := -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     101      QTMOC      := $(QTHOME)/bin/moc
    103102    endif
    104103  endif
     104  ifndef QTFLAGS
     105    QTFLAGS   := -I $(QTHOME)/QtCore.framework/Headers
     106    QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers
     107    QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
     108    QTFLAGS   += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     109  endif
    105110  ifndef QTLIBPATH
    106     ifeq ($(QT_VERSION),3)
    107       QTLIBPATH   := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "$(QTHOME)/lib/qt3/lib" || echo "$(QTHOME)/lib" )
     111    ifeq ($(QTHOME),/Library/Frameworks)
     112      QTLIBPATH  := -F$(QTHOME)
    108113    else
    109       QTLIBPATH  := -F$(QTHOME)/lib -F$(QTHOME)
     114      QTLIBPATH  := -F$(QTHOME)/lib
    110115    endif
    111116  endif
    112117  ifndef QTLIBS
    113     ifeq ($(QT_VERSION),3)
    114       QTLIBS   := -L$(QTLIBPATH)
    115       QT3_MT  := $(shell ls  $(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
    116       ifneq ($(QT3_MT),0)
    117         QTLIBS  += -lqt-mt
    118       else
    119         QTLIBS  += -lqt
    120       endif
    121       QTLIBS   += -lqui
    122     else
    123       QTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
    124     endif
     118    QTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
    125119  endif
    126120  ifndef GLQTLIBS
    127     ifeq ($(QT_VERSION),3)
    128         # already done in QTLIBS
    129         #      GLQTLIBS    := $(QTLIBS)
    130     else
    131       GLQTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
    132       GLQTLIBS    += -framework QtOpenGL
    133     endif
     121    GLQTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
     122    GLQTLIBS    += -framework QtOpenGL
    134123  endif
     124
    135125#----------------------------------------------------------------------------
    136126

  • trunk/config/sys/Linux-g++.gmk

    r1337 r1349  
    7777
    7878# ---- QT Setup block -------------------------------------------------------
     79
    7980  ifndef QTHOME
    8081    QTHOME     := /usr
    … …  
    8788
    8889  ifndef QTFLAGS
    89     ifeq ($(QT_VERSION),4)
    90       QTFLAGS   += -I$(QTHOME)/include
    91       QTFLAGS   += -I $(QTHOME)/include/QtCore
    92       QTFLAGS   += -I $(QTHOME)/include/QtGui
    93       QTFLAGS   += -I $(QTHOME)/include/QtOpenGL
    94     else
    95       QTFLAGS := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
    96 
    97       # If Qt is not located in the STANDARD path, try to find it in some
    98       # other places.(Ex: for ubuntu 8.10)
    99       QT_ALT1 := $(shell ls  $(QTHOME)/include/qt$(QT_VERSION)/*.h 2>/dev/null | wc -l )
    100       QT_ALT2 := $(shell ls  $(QTHOME)/include/qt$(QT_VERSION)/Qt/*.h 2>/dev/null | wc -l )
    101       ifneq ($(QT_ALT1),0)
    102         QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)
    103       endif
    104       ifneq ($(QT_ALT2),0)
    105         QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)/Qt
    106       endif
    107     endif
     90    QTFLAGS   := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
     91    QTFLAGS   += -I$(QTHOME)/include/QtCore
     92    QTFLAGS   += -I$(QTHOME)/include/QtGui
     93    QTFLAGS   += -I$(QTHOME)/include/QtOpenGL
    10894  endif
    10995  ifndef QTLIBPATH
    110     QT_SEARCH_LIB1 := $(shell ls  $(QTHOME)/lib/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
    111     QT_SEARCH_LIB2 := $(shell ls  $(QTHOME)/lib/libq*  2>/dev/null | wc -l )
    112     ifneq ($(QT_SEARCH_LIB1),0)
    113       QTLIBPATH   := $(QTHOME)/lib/qt$(QT_VERSION)
    114     endif
    115     ifneq ($(QT_SEARCH_LIB2),0)
    116       QTLIBPATH   := $(QTHOME)/lib
     96    QTLIBPATH := $(QTHOME)/lib
     97    QT_SEARCH_LIB := $(shell ls  $(QTLIBPATH)/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
     98    ifneq ($(QT_SEARCH_LIB),0)
     99      QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
    117100    endif
    118101  endif
    119102  ifndef QTLIBS
    120     QTLIBS   := -L$(QTLIBPATH)
    121     ifeq ($(QT_VERSION),3)
    122       QT3_MT  := $(shell ls  $(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
    123       ifneq ($(QT3_MT),0)
    124         QTLIBS  += -lqt-mt
    125       else
    126         QTLIBS  += -lqt
    127       endif
    128       QTLIBS   += -lqui
    129     else
    130       QTLIBS    += -lQtCore -lQtGui
    131     endif
     103    QTLIBS   := -L$(QTLIBPATH) -lQtCore -lQtGui
    132104  endif
    133105  ifndef GLQTLIBS
    134     ifeq ($(QT_VERSION),3)
    135         # already done in QTLIBS
    136         #      GLQTLIBS    := $(QTLIBS)
    137     else
    138       GLQTLIBS    := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
    139     endif
     106    GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
    140107  endif
     108
    141109#----------------------------------------------------------------------------
    142110

  • trunk/config/sys/Linux-icc.gmk

    r1337 r1349  
    2525    FCFLAGS   += -fPIC
    2626    CCFLAGS   += -fPIC
     27    LDFLAGS   += -i-dynamic
    2728  endif
    2829  G4RUNPATHOPTION := -Wl,-rpath -Wl,

  • trunk/config/sys/WIN32-VC.gmk

    r1337 r1349  
    4848  endif
    4949
    50   QT_VERSION  := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo QT4 || echo QT3)
    51 
    5250  ifndef QTLIBS
    53     ifeq ($(QT_VERSION),QT3)
    54       QTLIBS   := -L$(QTHOME)/lib -lqt-mt
    55     else
    56       QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib
    57     endif
     51    QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib
    5852  endif
    5953  ifndef GLQTLIBS
    60     ifeq ($(QT_VERSION),QT3)
    61       GLQTLIBS   := -L$(QTHOME)/lib -lqt-mt
    62     else
    63       GLQTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
    64     endif
     54    GLQTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
    6555  endif
    6656

  • trunk/source/interfaces/CVS/Entries

    r1347 r1349  
    44/CMakeLists.txt/1.1/Wed Sep 29 18:45:30 2010//Tgeant4-09-04-ref-00
    55/GNUmakefile/1.7/Thu Sep 30 06:11:40 2010//Tgeant4-09-04-ref-00
    6 /History/1.157/Wed Dec 22 10:23:15 2010//Tgeant4-09-04-ref-00
     6/History/1.158/Thu Dec 23 14:09:53 2010//

  • trunk/source/interfaces/History

    r1347 r1349  
    1 $Id: History,v 1.157 2010/11/02 17:39:48 allison Exp $
     1$Id: History,v 1.158 2010/12/23 14:09:53 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1818     ----------------------------------------------------------
    1919
     2023, December L. Garnier
     21- basic/GNUmakefile : Remove OGL stuff from Makefile
     22- common/GNUmakefile : Remove OGL stuff from Makefile
     23
    20248, October L. Garnier  (interfaces-V09-03-13)
    2125- G4UIQt : Fiw problem with redraw of help tree.

  • trunk/source/interfaces/basic/CVS/Entries

    r1347 r1349  
    22D/src////
    33/CMakeLists.txt/1.1/Wed Sep 29 18:45:55 2010//Tgeant4-09-04-ref-00
    4 /GNUmakefile/1.7/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
    54/sources.cmake/1.4/Wed Dec 22 10:23:15 2010//Tgeant4-09-04-ref-00
     5/GNUmakefile/1.8/Thu Dec 23 14:09:53 2010//

  • trunk/source/interfaces/basic/GNUmakefile

    r1347 r1349  
    1 # $Id: GNUmakefile,v 1.7 2009/10/19 07:37:48 lgarnier Exp $
     1# $Id: GNUmakefile,v 1.8 2010/12/23 14:09:53 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for interfaces/basic library.  John Allison, 6/7/98.
    … …  
    1313
    1414# For debug mode
    15 CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC
     15# CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC
    1616
    1717include $(G4INSTALL)/config/architecture.gmk

  • trunk/source/interfaces/common/CVS/Entries

    r1347 r1349  
    22D/src////
    33/CMakeLists.txt/1.1/Wed Sep 29 18:46:11 2010//Tgeant4-09-04-ref-00
    4 /GNUmakefile/1.5/dummy timestamp from new-entry//Tgeant4-09-04-ref-00
    54/sources.cmake/1.4/Wed Dec  1 16:36:10 2010//Tgeant4-09-04-ref-00
     5/GNUmakefile/1.6/Thu Dec 23 14:09:53 2010//

  • trunk/source/interfaces/common/GNUmakefile

    r1347 r1349  
    1 # $Id: GNUmakefile,v 1.5 2010/01/06 14:08:20 lgarnier Exp $
     1# $Id: GNUmakefile,v 1.6 2010/12/23 14:09:53 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for interfaces/common library.  John Allison, 6/7/98.
    … …  
    1313
    1414include $(G4INSTALL)/config/architecture.gmk
    15 #include $(G4INSTALL)/config/G4VIS_BUILD.gmk
    1615include $(G4INSTALL)/config/G4UI_BUILD.gmk
    1716include $(G4INSTALL)/config/interactivity.gmk
Note: See TracChangeset for help on using the changeset viewer.