Changeset 41f78a9


Ignore:
Timestamp:
Jun 8, 2010 2:04:38 PM (7 years ago)
Author:
costea <costea@…>
Branches:
master, experimental, feature_CIS, feature_PetascopeSecore, feature_cmake, feature_rasdapy, feature_wcps2, fixes, release_8.5, release_9.0, release_9.1, release_9.2, release_9.3, release_9.4, release_9.5
Children:
142db69
Parents:
fb117f7
git-author:
Peter Baumann <p.baumann@…> (04/01/10 11:23:06)
git-committer:
costea <costea@…> (06/08/10 14:04:38)
Message:

PB: removed #ifdef NO_OFFICIAL_RELEASE

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r7cd411b r41f78a9  
    33
    44AC_PREREQ(2.61)
    5 AC_INIT(Rasdaman, 8.0.0, p.baumann@jacobs-university.de)
     5AC_INIT(Rasdaman, 8.0.0, baumann@rasdaman.com)
    66RMANVERSION=8000
    77AM_INIT_AUTOMAKE()
     
    152152AH_TEMPLATE([BASEDBSTRING], [Name of the database that supports the compiled version of rasdaman.])   
    153153AH_TEMPLATE([RASSCHEMAVERSION], [The version of the schema the database uses.])
    154 AH_TEMPLATE([NO_OFFICIAL_RELEASE], [activate this if you generate a "non-official" release, i.e.: without license check])
    155154AH_TEMPLATE([CONFDIR], [The directory where the installed programs will find their configuration])
    156155# --------------- Parameter Definition -----------------------------
     
    286285AC_DEFINE([RASARCHITECTURE], ["X86"])
    287286AC_DEFINE([RASSCHEMAVERSION], [5])
    288 AC_DEFINE([NO_OFFICIAL_RELEASE])
    289287AC_DEFINE([NOPRE])
    290288# if not on DEC Alpha
  • rasmgr/rasmgr_config.cc

    rd815414 r41f78a9  
    6767        cmlMasterPort (cmlInter.addLongParameter(CommandLineParser::noShortName, "mport", "<port> listen port number of rasmgr master (slave only)", DEFAULT_PORT)),
    6868        cmlQuiet      (cmlInter.addFlagParameter( 'q', CommandLineParser::noLongName, "quiet: don't log requests (default: log requests to stdout)")),
    69 #ifdef NO_OFFICIAL_RELEASE         
     69#ifdef RMANDEBUG        // was: NO_OFFICIAL_RELEASE
    7070        cmlTest       (cmlInter.addFlagParameter(CommandLineParser::noShortName, "test", "test mode")),
    7171        cmlDSup       (cmlInter.addFlagParameter(CommandLineParser::noShortName, "dsup", "debug mode")),
     
    7373        cmlRth        (cmlInter.addFlagParameter(CommandLineParser::noShortName, "rth", "disable rthl test")),
    7474        cmlMultiWT    (cmlInter.addFlagParameter(CommandLineParser::noShortName, "amw", "allow multiple write transactions")),
    75 #endif         
     75#endif          // RMANDEBUG
    7676        cmlHelp       (cmlInter.addFlagParameter('h', RASMGRCMD_HELP, "print this help"))
    7777{
     
    415415        }       
    416416                 
    417 #ifdef NO_OFFICIAL_RELEASE
     417#ifdef RMANDEBUG        // was: NO_OFFICIAL_RELEASE
    418418        testModus = cmlTest.isPresent();
    419419        debugSupport=cmlDSup.isPresent();
     
    428428        allowMultiWT = cmlMultiWT.isPresent();
    429429
    430 #endif       
     430#endif       // RMANDEBUG
    431431
    432432        LEAVE( "Configuration::interpretArguments: leave. result=" << result );
  • rasmgr/rasmgr_config.hh

    rfb117f7 r41f78a9  
    111111      CommandLineParameter &cmlHelp, &cmlHostName, &cmlPort, &cmlPollFrequ;
    112112      CommandLineParameter &cmlMaster, &cmlMasterPort, &cmlName, &cmlQuiet;
    113 #ifdef RMANDEBUG
    114113      CommandLineParameter &cmlTest, &cmlDSup, &cmlRandTest, &cmlRth, &cmlMultiWT;
    115 #endif
    116114   };
    117115   
Note: See TracChangeset for help on using the changeset viewer.