# HG changeset patch
# User Ilia Gromov <ilia@netbeans.org>
# Date 1496850635 -10800
# Node ID 0bdf8b66a76b4c8dcf73d26103eb6b1d77be3012
# Parent  99d684ee4e5071ff1d567cb3ab09aed044fc7514
Fixing #270763 - Move clang-tidy integration to nb contrib
(transplanted from a225e57384a7fe82b6fb8ae18f5aa52e2350ce5a)

diff -r 99d684ee4e50 -r 0bdf8b66a76b clang-tidy.wrappers/analysis.clangtidy.Linux_x86_64/nbproject/build-impl.xml
--- a/clang-tidy.wrappers/analysis.clangtidy.Linux_x86_64/nbproject/build-impl.xml	Wed Jun 07 17:36:09 2017 +0300
+++ b/clang-tidy.wrappers/analysis.clangtidy.Linux_x86_64/nbproject/build-impl.xml	Wed Jun 07 18:50:35 2017 +0300
@@ -1,9 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>                                                                                                                                                                                                                                          
+<!--                                                                                                                                                                                                                                                                            
 *** GENERATED FROM project.xml - DO NOT EDIT  ***
 ***         EDIT ../build.xml INSTEAD         ***
 -->
 <project name="org.netbeans.modules.analysis.clangtidy.Linux_x86_64-impl" basedir="..">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
     <property file="nbproject/private/platform-private.properties"/>
     <property file="nbproject/platform.properties"/>
     <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
@@ -13,13 +20,21 @@
             <property name="@{name}" value="${@{value}}"/>
         </sequential>
     </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
     <property file="${user.properties.file}"/>
     <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="netbeans.dest.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="You must define 'nbplatform.${nbplatform.active}.harness.dir'">
+    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
         <condition>
             <not>
-                <available file="${harness.dir}" type="dir"/>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
             </not>
         </condition>
     </fail>
diff -r 99d684ee4e50 -r 0bdf8b66a76b clang-tidy.wrappers/analysis.clangtidy.Linux_x86_64/nbproject/genfiles.properties
--- a/clang-tidy.wrappers/analysis.clangtidy.Linux_x86_64/nbproject/genfiles.properties	Wed Jun 07 17:36:09 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d77a417d
-nbproject/build-impl.xml.script.CRC32=395569c1
-nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.72.1
diff -r 99d684ee4e50 -r 0bdf8b66a76b clang-tidy.wrappers/analysis.clangtidy.Linux_x86_64/release/clang-tidy/README.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/clang-tidy.wrappers/analysis.clangtidy.Linux_x86_64/release/clang-tidy/README.txt	Wed Jun 07 18:50:35 2017 +0300
@@ -0,0 +1,1 @@
+Place clang-tidy binary near this file
diff -r 99d684ee4e50 -r 0bdf8b66a76b clang-tidy.wrappers/post-build.sh
--- a/clang-tidy.wrappers/post-build.sh	Wed Jun 07 17:36:09 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#!/bin/bash -x
-
-#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-#
-function add_module() {
-    platform=$1
-    unzip -q com-oracle-tools-analysis-clangtidy-${platform}.nbm Info/info.xml
-#    cat Info/info.xml | egrep -e "<.?module|<.?manifest|<.?license" >> catalog.xml
-    cat Info/info.xml | egrep -e "<.?module|<.?manifest" >> catalog.xml
-    downlod_size=`ls -l com-oracle-tools-analysis-clangtidy-${platform}.nbm | awk '{print $5}'`
-    sed -e "s|downloadsize=\"0\"|downloadsize=\"${downlod_size}\"|" catalog.xml > tmp
-    sed -e "s|distribution=\"\"|distribution=\"com-oracle-tools-analysis-clangtidy-${platform}\.nbm\"|" tmp > catalog.xml
-    rm -rf tmp
-    rm -rf Info
-}
-
-function add_modules_licence() {
-    platform=$1
-    unzip -q com-oracle-tools-analysis-clangtidy-${platform}.nbm Info/info.xml
-    sed -e '/<license name/,/license>/!d' Info/info.xml >> catalog.xml
-    rm -rf Info
-}
-
-#upload="/net/everest/export1/sside/parfait/upload/"
-export projects=$1
-
-#cp ${projects}/Linux_x86/build/com-oracle-tools-analysis-parfait-Linux_x86.nbm out/
-cp ${projects}/Linux_x86_64/build/com-oracle-tools-analysis-clangtidy-Linux_x86_64.nbm out/
-
-cd out
-timestamp=`date +%H/%M/%S/%m/%d/%Y`
-
-echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" > catalog.xml
-echo "" >> catalog.xml
-echo "<!DOCTYPE module_updates PUBLIC \"-//NetBeans//DTD Autoupdate Catalog 2.6//EN\" \"http://www.netbeans.org/dtds/autoupdate-catalog-2_6.dtd\">" >> catalog.xml
-echo "<module_updates timestamp=\"${timestamp}\">" >> catalog.xml
-echo '<module_group name="Oracle Developer Studio">' >> catalog.xml
-
-#add_module Linux_x86
-add_module Linux_x86_64
-
-echo '</module_group>' >> catalog.xml
-add_modules_licence Linux_x86_64
-echo '</module_updates>' >> catalog.xml
-cp catalog.xml catalog.xml.1
-rm -f catalog.xml.gz
-gzip catalog.xml
-mv catalog.xml.1 catalog.xml
diff -r 99d684ee4e50 -r 0bdf8b66a76b clang-tidy.wrappers/pre-build.sh
--- a/clang-tidy.wrappers/pre-build.sh	Wed Jun 07 17:36:09 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#!/bin/bash -x
-
-export download_dir="$1"
-export projects_dir="$2"
-export netbeans="${projects_dir}/../../../netbeans"
-export harness="${projects_dir}/../../../netbeans/harness"
-
-assemble() {
-  local platform=$1
-
-  # erase contents of project's binary dir
-  local project_bin="${projects_dir}/${platform}/release/clang-tidy"
-  rm -rf   "$project_bin"
-  mkdir -p "$project_bin"
-
-  cp "${download_dir}/clang-tidy-${platform}" "$project_bin"
-
-  ant -f ${projects_dir}/${platform} -Ddo.not.clean.module.config.xml=true -Dcontinue.after.failing.tests=true -Dnbplatform.NetBeans_IDE_CND_Dev.netbeans.dest.dir="$netbeans" -Dnbplatform.NetBeans_IDE_CND_Release.netbeans.dest.dir="$netbeans" -Dnbplatform.NetBeans_IDE_CND_Dev.harness.dir="$harness" -Dnbplatform.NetBeans_IDE_CND_Release.harness.dir="$harness" clean netbeans
-  ant -f ${projects_dir}/${platform} -Dcontinue.after.failing.tests=true -Dnbplatform.NetBeans_IDE_CND_Dev.netbeans.dest.dir="$netbeans" -Dnbplatform.NetBeans_IDE_CND_Release.netbeans.dest.dir="$netbeans" -Dnbplatform.NetBeans_IDE_CND_Dev.harness.dir="$harness" -Dnbplatform.NetBeans_IDE_CND_Release.harness.dir="$harness" -Dkeystore=${WORKSPACE}/keystore/key.priv -Dnbm_alias=nb_ide -Dstorepass=ch0b0t7 nbm
-}
-
-assemble "Linux_x86_64"
diff -r 99d684ee4e50 -r 0bdf8b66a76b ide.analysis.modernize/src/org/netbeans/modules/ide/analysis/modernize/options/ClangAnalyzerOptions.java
--- a/ide.analysis.modernize/src/org/netbeans/modules/ide/analysis/modernize/options/ClangAnalyzerOptions.java	Wed Jun 07 17:36:09 2017 +0300
+++ b/ide.analysis.modernize/src/org/netbeans/modules/ide/analysis/modernize/options/ClangAnalyzerOptions.java	Wed Jun 07 18:50:35 2017 +0300
@@ -78,6 +78,8 @@
             String relativePath = String.format("%s/%s-%s", CLANG_BINARY_NAME, CLANG_BINARY_NAME, codeBase); //NOI18N
             File toolFile = InstalledFileLocator.getDefault().locate(relativePath, codeBase, false);
             if (toolFile != null && toolFile.exists()) {
+                toolFile.setExecutable(true);
+                System.out.println(toolFile.canExecute());
                 result = toolFile.getAbsolutePath();
             }
         }
@@ -98,7 +100,7 @@
     }
 
     public static String getMissingModuleName() {
-        return "com.oracle.tools.analysis.clangtidy." + getCodeBase(); //NOI18N
+        return "org.netbeans.modules.analysis.clangtidy." + getCodeBase(); //NOI18N
     }
 
     public static String getCodeBase() {