From fd4899f46f1bb7c2e6b4ec8f23efe76d56c0d1e1 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Sat, 23 Oct 2010 14:10:25 +0200 Subject: [PATCH] remove revisions.pl; we go with llvm releases now --- CMakeLists.txt | 16 ---------------- dmd/mars.c | 8 ++------ dmd2/mars.c | 7 ++----- gen/main.cpp | 1 - 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa2e0741a9..44fd91ec6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,22 +227,6 @@ endif(CMAKE_MINOR_VERSION LESS 6) add_executable(${LDC_EXE} ${LDC_SOURCE_FILES}) -# generate revision info -configure_file( - ${PROJECT_SOURCE_DIR}/revisions.pl.in - ${PROJECT_BINARY_DIR}/revisions.pl - @ONLY -) -add_custom_target( - gen_revs_h - COMMAND ${PERL_EXECUTABLE} ${PROJECT_BINARY_DIR}/revisions.pl - DEPENDS ${PROJECT_BINARY_DIR}/revisions.pl - COMMENT "Generating revisions.h and llvm-version.h" - WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/gen -) -add_dependencies(${LDC_EXE} gen_revs_h) -# - set(LDC_EXE_NAME ${PROGRAM_PREFIX}${LDC_EXE}${PROGRAM_SUFFIX}) set_target_properties( diff --git a/dmd/mars.c b/dmd/mars.c index e236c89b03..e3eae8ad1a 100644 --- a/dmd/mars.c +++ b/dmd/mars.c @@ -36,10 +36,6 @@ #include "lexer.h" #include "json.h" -#if IN_LLVM -#include "gen/revisions.h" -#endif - Global global; Global::Global() @@ -64,8 +60,8 @@ Global::Global() copyright = "Copyright (c) 1999-2010 by Digital Mars and Tomas Lindquist Olsen"; written = "written by Walter Bright and Tomas Lindquist Olsen"; version = "v1.063"; - ldc_version = LDC_REV; - llvm_version = LLVM_REV_STR; + ldc_version = "LDC trunk"; + llvm_version = "LLVM 2.8"; global.structalign = 8; // This should only be used as a global, so the other fields are diff --git a/dmd2/mars.c b/dmd2/mars.c index 22e46b1c49..c445fc49f3 100644 --- a/dmd2/mars.c +++ b/dmd2/mars.c @@ -35,9 +35,6 @@ #include "cond.h" #include "expression.h" #include "lexer.h" -#if IN_LLVM -#include "gen/revisions.h" -#else #include "lib.h" #if WINDOWS_SEH @@ -100,8 +97,8 @@ Global::Global() ; version = "v2.032"; #if IN_LLVM - ldc_version = LDC_REV; - llvm_version = LLVM_REV_STR; + ldc_version = "LDC trunk"; + llvm_version = "LLVM 2.8"; #endif global.structalign = 8; diff --git a/gen/main.cpp b/gen/main.cpp index ec9cba970a..e40b253399 100644 --- a/gen/main.cpp +++ b/gen/main.cpp @@ -4,7 +4,6 @@ // which uses the llvm license #include "gen/llvm.h" -#include "gen/llvm-version.h" #include "llvm/LinkAllVMCore.h" #include "llvm/Linker.h" #include "llvm/LLVMContext.h"