From a93c138df4c3f9a3c75f457b6c4ee441fdeefa4e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 11 Aug 2015 13:02:25 +0000 Subject: [PATCH] fix the other hardcoded declarations + automate that --- debian/patches/clang-analyzer-force-version.diff | 4 ++-- debian/patches/clang-format-version.diff | 6 +++--- debian/patches/python-clangpath.diff | 2 +- debian/prepare-new-release.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index 5e481650..8a1ee204 100644 --- a/debian/patches/clang-analyzer-force-version.diff +++ b/debian/patches/clang-analyzer-force-version.diff @@ -10,7 +10,7 @@ Index: llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer $Clang = $ENV{'CLANG_CXX'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-3.7'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-3.8'; } $IsCXX = 1 } @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer $Clang = $ENV{'CLANG'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-3.7'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-3.8'; } $IsCXX = 0 } diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 54a98dba..b8146634 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-form # set g:clang_format_path to the path to clang-format if it is not on the path # Change this to the full path if clang-format is not on the path. -binary = 'clang-format' -+binary = 'clang-format-3.7' ++binary = 'clang-format-3.8' if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path') @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-form # Change this to the full path if clang-format is not on the path. -binary = 'clang-format' -+binary = 'clang-format-3.7' ++binary = 'clang-format-3.8' def main(): @@ -33,7 +33,7 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/clang-format/clang-form (defcustom clang-format-executable - (or (executable-find "clang-format") -+ (or (executable-find "clang-format-3.7") ++ (or (executable-find "clang-format-3.8") "clang-format") "Location of the clang-format executable. diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index e44782c4..3826d7f5 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -7,7 +7,7 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/bindings/python/clang/cindex. file = 'libclang.dll' else: - file = 'libclang.so' -+ file = 'libclang-3.7.so' ++ file = 'libclang-3.8.so' if Config.library_path: file = Config.library_path + '/' + file diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 69cf2549..8745c3b4 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -9,7 +9,7 @@ for F in $LIST; do TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"` svn mv $F $TARGET done -LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links debian/orig-tar.sh debian/rules` +LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff` for F in $LIST; do sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F