Add -DDBUG_OFF to default release build

2025-12-24 14:20:59 +03:00 · 2016-02-10 10:35:46 -06:00
parent b68ade75e8
commit 96abc7d976
4 changed files with 1 additions and 3428 deletions
--- a/67
+++ b/67
@@ -1,67 +0,0 @@
-SHELL=/bin/bash
-
-ifeq (,$(findstring /root,${PWD}))
-	TOP=$(shell pwd | cut -d / -f 1,2,3,4)
-else
-	TOP=$(shell pwd | cut -d / -f 1,2,3)
-endif
-
-EXPORT_ROOT=$(TOP)/export
-INSTALL=cp --preserve=timestamps
-
-CALPONT_INSTALL_ROOT=$(EXPORT_ROOT)
-
-INSTALL_ROOT=$(CALPONT_INSTALL_ROOT)
-INSTALL_ROOT_INCLUDE=$(INSTALL_ROOT)/include
-INSTALL_ROOT_LIB=$(INSTALL_ROOT)/lib
-INSTALL_ROOT_BIN=$(INSTALL_ROOT)/bin
-INSTALL_ROOT_ETC=$(INSTALL_ROOT)/etc
-INSTALL_ROOT_POST=$(INSTALL_ROOT)/post
-INSTALL_ROOT_LOCAL=$(INSTALL_ROOT)/local
-INSTALL_ROOT_MYSQL=$(INSTALL_ROOT)/mysql
-INSTALL_ROOT_TOOLS=$(INSTALL_ROOT)/tools
-INSTALL_ROOT_DATDUP=$(INSTALL_ROOT)/gluster
-INSTALL_MIB=$(INSTALL_ROOT)/share/snmp/mibs
-
-CALPONT_LIBRARY_PATH=$(EXPORT_ROOT)/lib
-CALPONT_INCLUDE_PATH=$(EXPORT_ROOT)/include
-
-IDB_COMMON_LIBS=-lwindowfunction -ljoblist -lexecplan -ljoiner -lrowgroup -lfuncexp -ludfsdk \
-loamcpp -lsnmpmanager -ldataconvert -lbrm -lcacheutils -lmessageqcpp -lloggingcpp -lconfigcpp -lrwlock \
-lcommon -lcompress -lxml2 -lidbboot -lboost_idb -lmysqlcl_idb -lquerystats -lidbdatafile -lquerytele \
-lthrift -lpthread -lrt
-IDB_WRITE_LIBS=-lddlpackageproc -lddlpackage -ldmlpackageproc -ldmlpackage -lwriteengine -lwriteengineclient -lcompress -lcacheutils
-IDB_SNMP_LIBS=-lnetsnmpagent -lnetsnmp -lnetsnmpmibs -lnetsnmphelpers
-
-LDFLAGS=-Wl,--no-as-needed 
-
-DEBUG_FLAGS=-ggdb3 -fno-tree-vectorize
-#DEBUG_FLAGS=-g0 -O3 -fno-strict-aliasing -fno-tree-vectorize
-
-#DEBUG_FLAGS+=-DVALGRIND
-#DEBUG_FLAGS+=-DSKIP_OAM_INIT
-
-ifeq (i686,$(shell uname -m))
-	DEBUG_FLAGS+=-march=pentium4
-else ifeq (x86_64,$(shell uname -m))
-	ifeq (opteron,$(shell egrep -qs Opteron /proc/cpuinfo && echo 'opteron'))
-		DEBUG_FLAGS+=-march=opteron
-	endif
-endif
-
-ifeq (4.5,$(shell test -x /usr/local/gcc45/bin/gcc && /usr/local/gcc45/bin/gcc --version | awk '/^gcc/ {print $$3}' | cut -c1-3))
-	export LD_LIBRARY_PATH=/usr/local/gcc45/lib64:/usr/local/gmp43/lib:/usr/local/mpfr24/lib:/usr/local/mpc08/lib
-	export PATH=/usr/local/gcc45/bin:/usr/local/bin:/bin:/usr/bin
-	CC=/usr/local/gcc45/bin/gcc
-	CXX=/usr/local/gcc45/bin/g++
-	ifeq (-O3,$(findstring -O3,$(DEBUG_FLAGS)))
-		DEBUG_FLAGS+=-flto
-	endif
-endif
-
-#Use only the last, non-comment line from MyDebugFlags file
-LOCAL_DEBUG_FLAGS=$(shell test -f $(TOP)/MyDebugFlags && awk '/^[^\#]/ {last=$$0}END{print last}' $(TOP)/MyDebugFlags)
-ifneq (,$(LOCAL_DEBUG_FLAGS))
-	DEBUG_FLAGS=$(LOCAL_DEBUG_FLAGS)
-endif
-
--- a/dbcon/dmlpackage/dml-gram.cpp
+++ b/dbcon/dmlpackage/dml-gram.cpp
--- a/dbcon/dmlpackage/dml-gram.h
+++ b/dbcon/dmlpackage/dml-gram.h
@@ -1,272 +0,0 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton interface for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     NAME = 258,
-     STRING = 259,
-     INTNUM = 260,
-     APPROXNUM = 261,
-     SELECT = 262,
-     ALL = 263,
-     DISTINCT = 264,
-     NULLX = 265,
-     USER = 266,
-     INDICATOR = 267,
-     AMMSC = 268,
-     PARAMETER = 269,
-     ANY = 270,
-     SOME = 271,
-     OR = 272,
-     AND = 273,
-     NOT = 274,
-     COMPARISON = 275,
-     UMINUS = 276,
-     AS = 277,
-     ASC = 278,
-     AUTHORIZATION = 279,
-     BETWEEN = 280,
-     BY = 281,
-     CHARACTER = 282,
-     CHECK = 283,
-     CLOSE = 284,
-     COMMIT = 285,
-     CONTINUE = 286,
-     CREATE = 287,
-     CURRENT = 288,
-     CURSOR = 289,
-     IDB_DECIMAL = 290,
-     DECLARE = 291,
-     DEFAULT = 292,
-     DELETE = 293,
-     DESC = 294,
-     IDB_DOUBLE = 295,
-     ESCAPE = 296,
-     EXISTS = 297,
-     FETCH = 298,
-     IDB_FLOAT = 299,
-     FOR = 300,
-     FOREIGN = 301,
-     FOUND = 302,
-     FROM = 303,
-     GOTO = 304,
-     GRANT = 305,
-     IDB_GROUP = 306,
-     HAVING = 307,
-     IN = 308,
-     INSERT = 309,
-     INTEGER = 310,
-     INTO = 311,
-     IS = 312,
-     KEY = 313,
-     LANGUAGE = 314,
-     LIKE = 315,
-     NUMERIC = 316,
-     OF = 317,
-     ON = 318,
-     OPEN = 319,
-     OPTION = 320,
-     ORDER = 321,
-     PRECISION = 322,
-     PRIMARY = 323,
-     PRIVILEGES = 324,
-     PROCEDURE = 325,
-     PUBLIC = 326,
-     REAL = 327,
-     REFERENCES = 328,
-     ROLLBACK = 329,
-     SCHEMA = 330,
-     SET = 331,
-     SMALLINT = 332,
-     SQLCODE = 333,
-     SQLERROR = 334,
-     TABLE = 335,
-     TO = 336,
-     UNION = 337,
-     UNIQUE = 338,
-     UPDATE = 339,
-     VALUES = 340,
-     VIEW = 341,
-     WHENEVER = 342,
-     WHERE = 343,
-     WITH = 344,
-     WORK = 345
-   };
-#endif
-/* Tokens.  */
-#define NAME 258
-#define STRING 259
-#define INTNUM 260
-#define APPROXNUM 261
-#define SELECT 262
-#define ALL 263
-#define DISTINCT 264
-#define NULLX 265
-#define USER 266
-#define INDICATOR 267
-#define AMMSC 268
-#define PARAMETER 269
-#define ANY 270
-#define SOME 271
-#define OR 272
-#define AND 273
-#define NOT 274
-#define COMPARISON 275
-#define UMINUS 276
-#define AS 277
-#define ASC 278
-#define AUTHORIZATION 279
-#define BETWEEN 280
-#define BY 281
-#define CHARACTER 282
-#define CHECK 283
-#define CLOSE 284
-#define COMMIT 285
-#define CONTINUE 286
-#define CREATE 287
-#define CURRENT 288
-#define CURSOR 289
-#define IDB_DECIMAL 290
-#define DECLARE 291
-#define DEFAULT 292
-#define DELETE 293
-#define DESC 294
-#define IDB_DOUBLE 295
-#define ESCAPE 296
-#define EXISTS 297
-#define FETCH 298
-#define IDB_FLOAT 299
-#define FOR 300
-#define FOREIGN 301
-#define FOUND 302
-#define FROM 303
-#define GOTO 304
-#define GRANT 305
-#define IDB_GROUP 306
-#define HAVING 307
-#define IN 308
-#define INSERT 309
-#define INTEGER 310
-#define INTO 311
-#define IS 312
-#define KEY 313
-#define LANGUAGE 314
-#define LIKE 315
-#define NUMERIC 316
-#define OF 317
-#define ON 318
-#define OPEN 319
-#define OPTION 320
-#define ORDER 321
-#define PRECISION 322
-#define PRIMARY 323
-#define PRIVILEGES 324
-#define PROCEDURE 325
-#define PUBLIC 326
-#define REAL 327
-#define REFERENCES 328
-#define ROLLBACK 329
-#define SCHEMA 330
-#define SET 331
-#define SMALLINT 332
-#define SQLCODE 333
-#define SQLERROR 334
-#define TABLE 335
-#define TO 336
-#define UNION 337
-#define UNIQUE 338
-#define UPDATE 339
-#define VALUES 340
-#define VIEW 341
-#define WHENEVER 342
-#define WHERE 343
-#define WITH 344
-#define WORK 345
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
-
-
-	int intval;
-	double floatval;
-	char *strval;
-	int subtok;
-	dmlpackage::SqlStatementList *sqlStmtList;
-	dmlpackage::SqlStatement *sqlStmt;
-	dmlpackage::TableName* tblName;
-	dmlpackage::ColumnNameList* colNameList;
-	dmlpackage::ValuesOrQuery* valsOrQuery;
-	dmlpackage::ValuesList* valsList;
-	dmlpackage::QuerySpec* querySpec;
-	dmlpackage::TableNameList* tableNameList;
-	dmlpackage::TableExpression* tableExpression;
-	dmlpackage::WhereClause* whereClause;
-	dmlpackage::SearchCondition* searchCondition;
-	dmlpackage::ExistanceTestPredicate* existPredicate;
-	dmlpackage::AllOrAnyPredicate* allOrAnyPredicate;
-	dmlpackage::InPredicate* inPredicate;
-	dmlpackage::NullTestPredicate* nullTestPredicate;
-	dmlpackage::LikePredicate* likePredicate;
-	dmlpackage::BetweenPredicate* betweenPredicate;
-	dmlpackage::ComparisonPredicate* comparisonPredicate;
-	dmlpackage::Predicate* predicate;
-	dmlpackage::FromClause* fromClause;
-	dmlpackage::SelectFilter* selectFilter;
-	dmlpackage::GroupByClause* groupByClause;
-	dmlpackage::HavingClause* havingClause;
-	dmlpackage::Escape* escape;
-	dmlpackage::AtomList* atomList;
-	dmlpackage::ColumnAssignment* colAssignment;
-	dmlpackage::ColumnAssignmentList* colAssignmentList;
-
-
-
-} YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-extern YYSTYPE dmllval;
-
-
--- a/rules.mak
+++ b/rules.mak
@@ -36,7 +36,7 @@ IDB_SNMP_LIBS=-lnetsnmpagent -lnetsnmp -lnetsnmpmibs -lnetsnmphelpers
 LDFLAGS=-Wl,--no-as-needed 

 #DEBUG_FLAGS=-ggdb3 -fno-tree-vectorize -DSAFE_MUTEX -DSAFEMALLOC
-DEBUG_FLAGS=-g0 -O3 -fno-strict-aliasing -fno-tree-vectorize
+DEBUG_FLAGS=-g0 -O3 -fno-strict-aliasing -fno-tree-vectorize -DDBUG_OFF

 #DEBUG_FLAGS+=-DVALGRIND
 #DEBUG_FLAGS+=-DSKIP_OAM_INIT