Changeset 1688

Show
Ignore:
Timestamp:
Tue Oct 4 13:57:19 2005
Author:
maroy
Message:

moved tools, modules and products directories to livesupport/src

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/livesupport/bin/preInstall.sh

    r1601 r1688  
    43 43 etcdir=$basedir/etc  
    44 44 docdir=$basedir/doc  
      45 srcdir=$basedir/src  
    45 46 tmpdir=$basedir/tmp  
    46   toolsdir=$basedir/tools  
    47   modules_dir=$basedir/modules  
    48   products_dir=$basedir/products  
      47 toolsdir=$srcdir/tools  
      48 modules_dir=$srcdir/modules  
      49 products_dir=$srcdir/products  
    49 50  
    50 51 usrdir=`cd $basedir/usr; pwd;`  

  • trunk/livesupport/bin/gen_coverage_data.sh

    r1601 r1688  
    35 35 bindir=$basedir/bin  
    36 36 docdir=$basedir/doc  
      37 srcdir=$basedir/src  
    37 38 tmpdir=$basedir/tmp  
    38   modules_dir=$basedir/modules  
    39   products_dir=$basedir/products  
      39 modules_dir=$srcdir/modules  
      40 products_dir=$srcdir/products  
    40 41  
    41 42 usrdir=`cd $basedir/usr; pwd;`  

  • trunk/livesupport/bin/setupDevelopmentEnvironment.sh

    r1628 r1688  
    41 41 etcdir=$basedir/etc  
    42 42 docdir=$basedir/doc  
      43 srcdir=$basedir/src  
    43 44 tmpdir=$basedir/tmp  
    44   toolsdir=$basedir/tools  
    45   modules_dir=$basedir/modules  
    46   products_dir=$basedir/products  
      45 toolsdir=$srcdir/tools  
      46 modules_dir=$srcdir/modules  
      47 products_dir=$srcdir/products  
    47 48  
    48 49 usrdir=`cd $basedir/usr; pwd;`  
    106 107 $bindir/user_setup.sh || exit 1  
    107 108  
      109  
    108 110 #-------------------------------------------------------------------------------  
    109 111 #  We're done  

  • trunk/livesupport/bin/user_setup.sh

    r1628 r1688  
    43 43 etcdir=$basedir/etc  
    44 44 docdir=$basedir/doc  
      45 srcdir=$basedir/src  
    45 46 tmpdir=$basedir/tmp  
    46   toolsdir=$basedir/tools  
    47   modules_dir=$basedir/modules  
    48   products_dir=$basedir/products  
      47 toolsdir=$srcdir/tools  
      48 modules_dir=$srcdir/modules  
      49 products_dir=$srcdir/products  
    49 50  
    50 51 usrdir=`cd $basedir/usr; pwd;`  

  • trunk/livesupport/bin/dist.sh

    r1601 r1688  
    44 44 etcdir=$basedir/etc  
    45 45 docdir=$basedir/doc  
      46 srcdir=$basedir/src  
    46 47 tmpdir=$basedir/tmp  
    47   toolsdir=$basedir/tools  
    48   modules_dir=$basedir/modules  
    49   products_dir=$basedir/products  
      48 toolsdir=$srcdir/tools  
      49 modules_dir=$srcdir/modules  
      50 products_dir=$srcdir/products  
    50 51  
    51 52 usrdir=`cd $basedir/usr; pwd;`  
    …… 
    136 137  
    137 138 ls_tmpdir=$tmpdir/livesupport-$version  
    138   tools_tmpdir=$ls_tmpdir/tools  
    139   modules_tmpdir=$ls_tmpdir/modules  
    140   products_tmpdir=$ls_tmpdir/products  
      139 src_tmpdir=$ls_tmpdir/src  
      140 tools_tmpdir=$src_tmpdir/tools  
      141 modules_tmpdir=$src_tmpdir/modules  
      142 products_tmpdir=$src_tmpdir/products  
    141 143 doc_tmpdir=$ls_tmpdir/doc  
    142 144 etc_tmpdir=$ls_tmpdir/etc  
    206 208 mkdir -p $ls_tmpdir/usr  
    207 209 mkdir -p $tmp_tmpdir  
      210 mkdir -p $src_tmpdir  
    208 211 mkdir -p $modules_tmpdir  
    209 212 mkdir -p $products_tmpdir  

  • trunk/livesupport/bin/user_setup_db.sh

    r1601 r1688  
    43 43 etcdir=$basedir/etc  
    44 44 docdir=$basedir/doc  
      45 srcdir=$basedir/src  
    45 46 tmpdir=$basedir/tmp  
    46   toolsdir=$basedir/tools  
    47   modules_dir=$basedir/modules  
    48   products_dir=$basedir/products  
      47 toolsdir=$srcdir/tools  
      48 modules_dir=$srcdir/modules  
      49 products_dir=$srcdir/products  
    49 50  
    50 51 usrdir=`cd $basedir/usr; pwd;`  

  • trunk/livesupport/bin/setup_test_db.sh

    r1601 r1688  
    38 38 etcdir=$basedir/etc  
    39 39 docdir=$basedir/doc  
      40 srcdir=$basedir/src  
    40 41 tmpdir=$basedir/tmp  
    41   toolsdir=$basedir/tools  
    42   modules_dir=$basedir/modules  
    43   products_dir=$basedir/products  
      42 toolsdir=$srcdir/tools  
      43 modules_dir=$srcdir/modules  
      44 products_dir=$srcdir/products  
    44 45  
    45 46 usrdir=`cd $basedir/usr; pwd;`  

  • trunk/livesupport/etc/Makefile.in

    r1620 r1688  
    49 49 COVERAGE_DIR = ${DOC_DIR}/coverage  
    50 50 ETC_DIR      = ${BASE_DIR}/etc  
      51 SRC_DIR      = ${BASE_DIR}/src  
    51 52 TMP_DIR      = ${BASE_DIR}/tmp  
    52 53  
    …… 
    96 97 FLAWFINDER_FILE  = ${DOC_DIR}/flawfinderReport.html  
    97 98  
    98   TOOLS_DIR  = ${BASE_DIR}/tools  
      99 TOOLS_DIR  = ${SRC_DIR}/tools  
    98 99  
    99 100 BOOST_DIR         = ${TOOLS_DIR}/boost  
    …… 
    124 125 PEAR_DIR          = ${TOOLS_DIR}/pear  
    125 126  
    126   MODULES_DIR            = ${BASE_DIR}/modules  
      127 MODULES_DIR            = ${SRC_DIR}/modules  
    126 127 CORE_DIR               = ${MODULES_DIR}/core  
    127 128 AUTHENTICATION_DIR     = ${MODULES_DIR}/authentication  
    141 142 STORAGE_SERVER_DIR     = ${MODULES_DIR}/storageServer  
    142 143  
    143   PRODUCTS_DIR  = ${BASE_DIR}/products  
    144   SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler  
      144 PRODUCTS_DIR     = ${SRC_DIR}/products  
      145 SCHEDULER_DIR    = ${PRODUCTS_DIR}/scheduler  
    145 146 GLIVESUPPORT_DIR = ${PRODUCTS_DIR}/gLiveSupport  
    146 147  

  • trunk/livesupport/etc/configure.ac

    r1601 r1688  
    38 38 AC_REVISION($Revision$)  
    39 39  
    40   AC_CONFIG_SRCDIR(../products/scheduler/src/main.cxx)  
      40 AC_CONFIG_SRCDIR(../src/products/scheduler/src/main.cxx)  
    40 40  
    41 41 AC_PROG_CC()  
    418 418  
    419 419 dnl set up the alib module  
    420   AC_CONFIG_COMMANDS([../modules/alib/tmp/configure],  
    421                      [../modules/alib/bin/autogen.sh])  
      420 AC_CONFIG_COMMANDS([../src/modules/alib/tmp/configure],  
      421                    [../src/modules/alib/bin/autogen.sh])  
    422 422  
    423 423 dnl set up the archive server module  
    424   AC_CONFIG_COMMANDS([../modules/archiveServer/tmp/configure],  
    425                      [../modules/archiveServer/bin/autogen.sh])  
      424 AC_CONFIG_COMMANDS([../src/modules/archiveServer/tmp/configure],  
      425                    [../src/modules/archiveServer/bin/autogen.sh])  
    426 426  
    427 427 dnl set up the getid3 module  
    428   AC_CONFIG_COMMANDS([../modules/getid3/tmp/configure],  
    429                      [../modules/getid3/bin/autogen.sh])  
      428 AC_CONFIG_COMMANDS([../src/modules/getid3/tmp/configure],  
      429                    [../src/modules/getid3/bin/autogen.sh])  
    430 430  
    431 431 dnl set up the htmlUI module  
    432   AC_CONFIG_COMMANDS([../modules/htmlUI/tmp/configure],  
    433                      [../modules/htmlUI/bin/autogen.sh])  
      432 AC_CONFIG_COMMANDS([../src/modules/htmlUI/tmp/configure],  
      433                    [../src/modules/htmlUI/bin/autogen.sh])  
    434 434  
    435 435 dnl set up the storage admin module  
    436   AC_CONFIG_COMMANDS([../modules/storageAdmin/tmp/configure],  
    437                      [../modules/storageAdmin/bin/autogen.sh])  
      436 AC_CONFIG_COMMANDS([../src/modules/storageAdmin/tmp/configure],  
      437                    [../src/modules/storageAdmin/bin/autogen.sh])  
    438 438  
    439 439 dnl set up the storage server module  
    440   AC_CONFIG_COMMANDS([../modules/storageServer/tmp/configure],  
    441                      [../modules/storageServer/bin/autogen.sh])  
      440 AC_CONFIG_COMMANDS([../src/modules/storageServer/tmp/configure],  
      441                    [../src/modules/storageServer/bin/autogen.sh])  
    442 442  
    443 443 dnl set up the core module  
    444   AC_CONFIG_COMMANDS([../modules/core/tmp/configure],  
    445                      [../modules/core/bin/autogen.sh])  
      444 AC_CONFIG_COMMANDS([../src/modules/core/tmp/configure],  
      445                    [../src/modules/core/bin/autogen.sh])  
    446 446  
    447 447 dnl set up the authentication module  
    448   AC_CONFIG_COMMANDS([../modules/authentication/tmp/configure],  
    449                      [../modules/authentication/bin/autogen.sh])  
      448 AC_CONFIG_COMMANDS([../src/modules/authentication/tmp/configure],  
      449                    [../src/modules/authentication/bin/autogen.sh])  
    450 450  
    451 451 dnl set up the db module  
    452   AC_CONFIG_COMMANDS([../modules/db/tmp/configure],  
    453                      [../modules/db/bin/autogen.sh])  
      452 AC_CONFIG_COMMANDS([../src/modules/db/tmp/configure],  
      453                    [../src/modules/db/bin/autogen.sh])  
    454 454  
    455 455 dnl set up the storage module  
    456   AC_CONFIG_COMMANDS([../modules/storage/tmp/configure],  
    457                      [../modules/storage/bin/autogen.sh])  
      456 AC_CONFIG_COMMANDS([../src/modules/storage/tmp/configure],  
      457                    [../src/modules/storage/bin/autogen.sh])  
    458 458  
    459 459 dnl set up the gstreamer elements module  
    460   AC_CONFIG_COMMANDS([../modules/gstreamerElements/tmp/configure],  
    461                      [../modules/gstreamerElements/bin/autogen.sh])  
      460 AC_CONFIG_COMMANDS([../src/modules/gstreamerElements/tmp/configure],  
      461                    [../src/modules/gstreamerElements/bin/autogen.sh])  
    462 462  
    463 463 dnl set up the playlist executor module  
    464   AC_CONFIG_COMMANDS([../modules/playlistExecutor/tmp/configure],  
    465                      [../modules/playlistExecutor/bin/autogen.sh])  
      464 AC_CONFIG_COMMANDS([../src/modules/playlistExecutor/tmp/configure],  
      465                    [../src/modules/playlistExecutor/bin/autogen.sh])  
    466 466  
    467 467 dnl set up the event scheduler module  
    468   AC_CONFIG_COMMANDS([../modules/eventScheduler/tmp/configure],  
    469                      [../modules/eventScheduler/bin/autogen.sh])  
      468 AC_CONFIG_COMMANDS([../src/modules/eventScheduler/tmp/configure],  
      469                    [../src/modules/eventScheduler/bin/autogen.sh])  
    470 470  
    471 471 dnl set up the scheduler client module  
    472   AC_CONFIG_COMMANDS([../modules/schedulerClient/tmp/configure],  
    473                      [../modules/schedulerClient/bin/autogen.sh])  
      472 AC_CONFIG_COMMANDS([../src/modules/schedulerClient/tmp/configure],  
      473                    [../src/modules/schedulerClient/bin/autogen.sh])  
    474 474  
    475 475 dnl set up the  widgets module  
    476   AC_CONFIG_COMMANDS([../modules/widgets/tmp/configure],  
    477                      [../modules/widgets/bin/autogen.sh])  
      476 AC_CONFIG_COMMANDS([../src/modules/widgets/tmp/configure],  
      477                    [../src/modules/widgets/bin/autogen.sh])  
    478 478  
    479 479 dnl set up the scheduler product  
    480   AC_CONFIG_COMMANDS([../products/scheduler/tmp/configure],  
    481                      [../products/scheduler/bin/autogen.sh])  
      480 AC_CONFIG_COMMANDS([../src/products/scheduler/tmp/configure],  
      481                    [../src/products/scheduler/bin/autogen.sh])  
    482 482  
    483 483 dnl set up the gLiveSupport product  
    484   AC_CONFIG_COMMANDS([../products/gLiveSupport/tmp/configure],  
    485                      [../products/gLiveSupport/bin/autogen.sh])  
      484 AC_CONFIG_COMMANDS([../src/products/gLiveSupport/tmp/configure],  
      485                    [../src/products/gLiveSupport/bin/autogen.sh])  
    486 486  
    487 487