Changeset 1213 for trunk


Ignore:
Timestamp:
Dec 10, 2009, 5:31:31 PM (14 years ago)
Author:
garnier
Message:

Suppression de Xaw. Sauf dans Configure et les fichier G4UIXaw.hh et cc

Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/G4UI_BUILD.gmk

    r593 r1213  
    3131endif
    3232
    33 ifdef G4UI_BUILD_XAW_SESSION
    34   G4UI_BUILD = 1
    35   G4UI_BUILD_BASIC_SESSION = 1
    36   G4INTY_BUILD_XT = 1
    37   INC_XAW = 1
    38   CPPFLAGS += -DG4UI_BUILD_XAW_SESSION
    39 endif
    40 
    4133ifdef G4UI_BUILD_WIN32_SESSION
    4234  G4UI_BUILD = 1
    … …  
    6052   endif
    6153
    62    ifdef G4UI_BUILD_XAW_SESSION
    63      G4UI_USE_XAW = 1
    64    endif
    65 
    6654   ifdef G4UI_BUILD_WIN32_SESSION
    6755     G4UI_USE_WIN32 = 1

  • trunk/config/G4UI_USE.gmk

    r1045 r1213  
    6868endif
    6969
    70 ifdef G4UI_USE_XAW
    71   G4UI_USE  = 1
    72   G4INTY_USE_XT = 1
    73   INC_XAW   = 1
    74   LOAD_XAW  = 1
    75   CPPFLAGS += -DG4UI_USE_XAW
    76 endif
    77 
    7870ifdef G4UI_USE_WIN32
    7971  G4UI_USE  = 1

  • trunk/config/History

    r1195 r1213  
    1717     ----------------------------------------------------------
    1818
     1910th December 2009  Laurent Garnier
     20-Remove old XAW driver
     21 
    192218th November 2009  Gabriele Cosmo (config-V09-02-15)
    2023- architecture.gmk: corrected inclusion of -lz for zlib.

  • trunk/config/interactivity.gmk

    r855 r1213  
    5858endif
    5959
    60 # Should be before X11.
    61 ifdef INC_XAW
    62   INC_X11   = 1
    63   CPPFLAGS += $(XAWFLAGS)
    64 endif
    65 ifdef LOAD_XAW
    66   LOAD_X11           = 1
    67   INTYLIBS += $(XAWLIBS)
    68 endif
    69 
    70 
    7160ifdef INC_X11
    7261  CPPFLAGS += $(X11FLAGS)

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

    r1195 r1213  
    5757unsetenv  G4UI_NONE
    5858unsetenv  G4UI_BUILD_WIN32_SESSION
    59 unsetenv  G4UI_BUILD_XAW_SESSION
    6059unsetenv  G4UI_BUILD_XM_SESSION
    6160unsetenv  G4UI_USE_TCSH
    6261unsetenv  G4UI_USE_WIN32
    63 unsetenv  G4UI_USE_XAW
    6462unsetenv  G4UI_USE_XM
    6563unsetenv  G4UI_USE_QT
    … …  
    228226
    229227#+
    230 if ( X$g4ui_build_xaw_session == Xy ) then
    231 setenv G4UI_BUILD_XAW_SESSION 1
    232 echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
    233 endif
    234 
    235 #+
    236 if ( X$g4ui_use_xaw == Xy ) then
    237 setenv G4UI_USE_XAW 1
    238 echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
    239 endif
    240 
    241 #+
    242228if ( X$g4ui_build_xm_session == Xy ) then
    243229setenv G4UI_BUILD_XM_SESSION 1
    … …  
    431417echo "On this machine the XMLIBS=\$XMLIBS"
    432418endif
    433 
    434 #+
    435 if ( X$g4ui_build_xaw_session != X )  then
    436 setenv XAWFLAGS "$g4ui_xawflags"
    437 echo "On this machine the XAWFLAGS=\$XAWFLAGS"
    438 endif
    439 
    440 #+
    441 if ( X$g4ui_build_xaw_session != X )  then
    442 setenv XAWLIBS "$g4ui_xawlibs"
    443 echo "On this machine the XAWLIBS=\$XAWLIBS"
    444 endif
    445 
    446419
    447420#

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

    r1195 r1213  
    5757unset  G4UI_NONE
    5858unset  G4UI_BUILD_WIN32_SESSION
    59 unset  G4UI_BUILD_XAW_SESSION
    6059unset  G4UI_BUILD_XM_SESSION
    6160unset  G4UI_USE_TCSH
    6261unset  G4UI_USE_WIN32
    63 unset  G4UI_USE_XAW
    6462unset  G4UI_USE_XM
    6563unset  G4UI_USE_QT
    … …  
    290288
    291289#+
    292 if [ X$g4ui_build_xaw_session = Xy ] ; then
    293 G4UI_BUILD_XAW_SESSION=1
    294 export G4UI_BUILD_XAW_SESSION
    295 if [ X\$g4non_display = X ] ; then
    296 echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
    297 fi
    298 fi
    299 
    300 #+
    301 if [ X$g4ui_use_xaw = Xy ] ; then
    302 G4UI_USE_XAW=1
    303 export G4UI_USE_XAW
    304 if [ X\$g4non_display = X ] ; then
    305 echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
    306 fi
    307 fi
    308 
    309 #+
    310290if [ X$g4ui_build_xm_session = Xy ] ; then
    311291G4UI_BUILD_XM_SESSION=1
    … …  
    597577fi
    598578fi
    599 
    600 #+
    601 if [ X$g4ui_build_xaw_session != X ] ; then
    602 XAWFLAGS="$g4ui_xawflags"
    603 export XAWFLAGS
    604 if [ X\$g4non_display = X ] ; then
    605 echo "On this machine the XAWFLAGS=\$XAWFLAGS"
    606 fi
    607 fi
    608 
    609 #+
    610 if [ X$g4ui_build_xaw_session != X ] ; then
    611 XAWLIBS="$g4ui_xawlibs"
    612 export XAWLIBS
    613 if [ X\$g4non_display = X ] ; then
    614 echo "On this machine the XAWLIBS=\$XAWLIBS"
    615 fi
    616 fi
    617 
    618579
    619580#

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

    r1195 r1213  
    5656unset  G4UI_NONE
    5757unset  G4UI_BUILD_WIN32_SESSION
    58 unset  G4UI_BUILD_XAW_SESSION
    5958unset  G4UI_BUILD_XM_SESSION
    6059unset  G4UI_BUILD_QT_SESSION
    6160unset  G4UI_USE_TCSH
    6261unset  G4UI_USE_WIN32
    63 unset  G4UI_USE_XAW
    6462unset  G4UI_USE_XM
    6563unset  G4UI_USE_QT
    … …  
    244242
    245243#+
    246 if [ X$g4ui_build_xaw_session = Xy ] ; then
    247 G4UI_BUILD_XAW_SESSION=1
    248 export G4UI_BUILD_XAW_SESSION
    249 echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
    250 fi
    251 
    252 #+
    253 if [ X$g4ui_use_xaw = Xy ] ; then
    254 G4UI_USE_XAW=1
    255 export G4UI_USE_XAW
    256 echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
    257 fi
    258 
    259 #+
    260244if [ X$g4ui_build_xm_session = Xy ] ; then
    261245G4UI_BUILD_XM_SESSION=1
    … …  
    501485fi
    502486fi
    503 
    504 #+
    505 if [ X$g4ui_build_xaw_session != X ] ; then
    506 XAWFLAGS="$g4ui_xawflags"
    507 export XAWFLAGS
    508 if [ X\$g4non_display = X ] ; then
    509 echo "On this machine the XAWFLAGS=\$XAWFLAGS"
    510 fi
    511 fi
    512 
    513 #+
    514 if [ X$g4ui_build_xaw_session != X ] ; then
    515 XAWLIBS="$g4ui_xawlibs"
    516 export XAWLIBS
    517 if [ X\$g4non_display = X ] ; then
    518 echo "On this machine the XAWLIBS=\$XAWLIBS"
    519 fi
    520 fi
    521 
    522 
    523487
    524488# Qt Flags and Libs, messy, but needed for backward compatibility

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

    r689 r1213  
    165165#
    166166#+
    167 if [ X$g4ui_build_xaw_session = Xy ] ; then
    168 G4UI_BUILD_XAW_SESSION=1
    169 export G4UI_BUILD_XAW_SESSION
    170 echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
    171 fi
    172 
    173 #+
    174 if [ X$g4ui_use_xaw = Xy ] ; then
    175 G4UI_USE_XAW=1
    176 export G4UI_USE_XAW
    177 echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
    178 fi
    179 
    180 #+
    181167if [ X$g4ui_build_xm_session = Xy ] ; then
    182168G4UI_BUILD_XM_SESSION=1

  • trunk/config/sys/AIX-xlC.gmk

    r865 r1213  
    3030    XMLIBS    := -L/usr/lib -lXm -lXt -lX11
    3131  endif
    32   ifndef XAWFLAGS
    33     XAWFLAGS  := -I/usr/include/X11
    34   endif
    35   ifndef XAWLIBS
    36     XAWLIBS   := -L/usr/lib -lXaw -lXmu -lXt -lX11 -lXext
    37   endif
    3832  ifndef OGLFLAGS
    3933    OGLFLAGS  := -I$(OGLHOME)/include

  • trunk/config/sys/DEC-cxx.gmk

    r472 r1213  
    3131    XMLIBS    := -lXm
    3232  endif
    33   ifndef XAWFLAGS
    34     XAWFLAGS   :=
    35   endif
    36   ifndef XAWLIBS
    37     XAWLIBS    := -lXaw
    38   endif
    3933  ifndef OGLFLAGS
    4034    OGLFLAGS  := -I$(OGLHOME)/include

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

    r1185 r1213  
    5454    XMLIBS    := -L/sw/lib -lXm -lXpm
    5555#   XMLIBS    := -L/usr/X11R6/lib -lXm -lXpm   ##### some installations.
    56   endif
    57   ifndef XAWFLAGS
    58     XAWFLAGS   := -I/sw/include
    59 #   XAWFLAGS   := -I/usr/X11R6/include         ##### some installations.
    60   endif
    61   ifndef XAWLIBS
    62     XAWLIBS    := -lXaw
    6356  endif
    6457  DLDLIBS   := -ldl

  • trunk/config/sys/HP-aCC.gmk

    r472 r1213  
    3838    XMLIBS    := -L/usr/lib/Motif1.2_R6 -lXm
    3939  endif
    40   ifndef XAWFLAGS
    41     XAWFLAGS  := -I/usr/contrib/X11R6/include -I/usr/contrib/X11R6/include/X11
    42   endif
    43   ifndef XAWLIBS
    44     XAWLIBS   := -L/usr/contrib/X11R6/lib -lXaw
    45   endif
    4640  ifndef OGLFLAGS
    4741    OGLFLAGS  := -I$(OGLHOME)/include

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

    r472 r1213  
    4444    XMLIBS    := -lXm -lXpm
    4545  endif
    46   ifndef XAWFLAGS
    47     XAWFLAGS   := -I/usr/X11R6/include
    48   endif
    49   ifndef XAWLIBS
    50     XAWLIBS    := -lXaw
    51   endif
    5246  DLDLIBS   := -ldl
    5347  ifndef OGLFLAGS

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

    r1030 r1213  
    6161  ifndef XMLIBS
    6262    XMLIBS    := -lXm -lXpm
    63   endif
    64   ifndef XAWFLAGS
    65     XAWFLAGS   := -I/usr/X11R6/include
    66   endif
    67   ifndef XAWLIBS
    68     XAWLIBS    := -lXaw
    6963  endif
    7064  DLDLIBS   := -ldl

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

    r1045 r1213  
    4646    XMLIBS    := -lXm -lXpm
    4747  endif
    48   ifndef XAWFLAGS
    49     XAWFLAGS   := -I/usr/X11R6/include
    50   endif
    51   ifndef XAWLIBS
    52     XAWLIBS    := -lXaw
    53   endif
    5448  DLDLIBS   := -ldl
    5549  ifndef OGLFLAGS

  • trunk/config/sys/SGI-CC.gmk

    r472 r1213  
    3030    XMLIBS    := -L/usr/lib -lXm
    3131  endif
    32   ifndef XAWFLAGS
    33     XAWFLAGS   :=
    34   endif
    35   ifndef XAWLIBS
    36     XAWLIBS    := -lXaw
    37   endif
    3832  ifndef OGLFLAGS
    3933    OGLFLAGS  :=

  • trunk/config/sys/SUN-CC.gmk

    r593 r1213  
    3939    XMLIBS    += -R/usr/openwin/lib -lXt -lXm -lX11
    4040  endif
    41   ifndef XAWFLAGS
    42     XAWFLAGS  := -I/usr/openwin/include/X11
    43   endif
    44   ifndef XAWLIBS
    45     XAWLIBS   := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib
    46     XAWLIBS   += -R/usr/openwin/lib -lXaw -lXmu -lXt -lX11 -lXext
    47   endif
    4841  ifndef OGLFLAGS
    4942    OGLFLAGS  := -I$(OGLHOME)/include

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

    r1185 r1213  
    6060    XMLIBS    := -lXm -lXpm
    6161  endif
    62   ifndef XAWFLAGS
    63     XAWFLAGS  := -I/usr/X11R6/include
    64   endif
    65   ifndef XAWLIBS
    66     XAWLIBS   := -lXaw
    67   endif
    6862  ifndef OGLFLAGS
    6963    OGLFLAGS  := -I$(OGLHOME)/include

  • trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/Appendix/makeFile.xml

    r1211 r1213  
    454454  <varlistentry>
    455455    <term>
    456       G4UI_BUILD_XM_SESSION, G4UI_BUILD_XAW_SESSION
    457     </term>
    458     <listitem>
    459       Specifies to include in kernel library the <emphasis>XM</emphasis> or
    460       <emphasis>XAW</emphasis> Motif-based user interfaces.
    461     </listitem>
    462   </varlistentry>
    463   <varlistentry>
    464     <term>
    465       G4UI_USE_XM, G4UI_USE_XAW
    466     </term>
    467     <listitem>
    468       Specifies to use the <emphasis>XM</emphasis> or <emphasis>XAW</emphasis>
     456      G4UI_BUILD_XM_SESSION
     457    </term>
     458    <listitem>
     459      Specifies to include in kernel library the <emphasis>XM</emphasis>.
     460    </listitem>
     461  </varlistentry>
     462  <varlistentry>
     463    <term>
     464      G4UI_USE_XM
     465    </term>
     466    <listitem>
     467      Specifies to use the <emphasis>XM</emphasis>
    469468      interfaces in the application to be built.
    470469    </listitem>

  • trunk/documents/UserDoc/DocBookUsersGuides/ForApplicationDeveloper/xml/GettingStarted/graphicalUserInterface.xml

    r1212 r1213  
    6666  </para></listitem>
    6767  <listitem><para>
    68   Xm, Xaw, Win32, Qt variations of the upper terminal by using a
    69   Motif, Athena, Qt or Windows widget to retrieve commands, and
     68  Xm, Win32, Qt variations of the upper terminal by using a
     69  Motif, Qt or Windows widget to retrieve commands, and
    7070  </para></listitem>
    7171  <listitem><para>
    … …  
    226226<sect3 id="sect.HowToSetUpInter.DescInter.G4UIXm">
    227227<title>
    228 <emphasis>G4UIXm</emphasis>, <emphasis>G4UIXaw</emphasis>, <emphasis>G4UIQt</emphasis> and
     228<emphasis>G4UIXm</emphasis>, <emphasis>G4UIQt</emphasis> and
    229229<emphasis>G4UIWin32</emphasis> classes
    230230</title>
    … …  
    232232<para>
    233233These interfaces are versions of <emphasis>G4UIterminal</emphasis>
    234 implemented over libraries Motif, Athena, Qt and WIN32 respectively.
     234implemented over libraries Motif, Qt and WIN32 respectively.
    235235<emphasis>G4UIXm</emphasis> uses the Motif XmCommand widget,
    236 <emphasis>G4UIXaw</emphasis> the Athena dialog
    237 widget, <emphasis>G4UIQt</emphasis> the Qt dialog
     236<emphasis>G4UIQt</emphasis> the Qt dialog
    238237widget, and <emphasis>G4UIWin32</emphasis> the Windows "edit" component to do the
    239238command capturing. These interfaces are useful if working in
    … …  
    279278
    280279<para>
    281 <emphasis>G4UIXm</emphasis> runs on Unix/Linux with Motif. <emphasis>G4UIXaw</emphasis>,
    282 less user friendly, runs on Unix with Athena widgets. <emphasis>G4UIQt</emphasis> run
     280<emphasis>G4UIXm</emphasis> runs on Unix/Linux with Motif. <emphasis>G4UIQt</emphasis> run
    283281everywhere with Qt.
    284282<emphasis>G4UIWin32</emphasis> runs on Windows.
    … …  
    403401
    404402<para>
    405 To make the libraries of <emphasis>G4UIXm</emphasis>, <emphasis>G4UIXaw</emphasis>,
     403To make the libraries of <emphasis>G4UIXm</emphasis>,
    406404 <emphasis>G4UIQt</emphasis> and
    407405<emphasis>G4UIWin32</emphasis> , respective environment variables
    408406<emphasis role="bold">G4UI_BUILD_XM_SESSION</emphasis>,
    409 <emphasis role="bold">G4UI_BUILD_XAW_SESSION</emphasis>,
    410407<emphasis role="bold">G4UI_BUILD_QT_SESSION</emphasis> or
    411408<emphasis role="bold">G4UI_BUILD_WIN32_SESSION</emphasis> must be set
    … …  
    435432<para>
    436433To use a given interface
    437 (<literal>G4UIxxx</literal> where <literal>xxx = terminal,Xm, Xaw, Win32, Qt,
     434(<literal>G4UIxxx</literal> where <literal>xxx = terminal,Xm, Win32, Qt,
    438435GAG, GainServer</literal>) in your program, you can do it by two ways :
    439436<itemizedlist spacing="compact">
    … …  
    552549   <listitem><para>
    553550   The environment variable <emphasis role="bold">G4UI_USE_XM</emphasis>,
    554 <emphasis role="bold">G4UI_USE_QT</emphasis>,   <emphasis role="bold">G4UI_USE_XAW</emphasis> or
     551<emphasis role="bold">G4UI_USE_QT</emphasis> or
    555552   <emphasis role="bold">G4UI_USE_WIN32</emphasis> must be set to use the
    556553   respective interface. The file "$G4INSTALL/config/G4UI_USE.gmk"
Note: See TracChangeset for help on using the changeset viewer.