From 88ceb42356e8e380f11e71d85cf18a51246521fe Mon Sep 17 00:00:00 2001
From: Andrew Eisenberg <aeisenberg@github.com>
Date: Tue, 17 Aug 2021 13:39:21 -0700
Subject: [PATCH] Packaging: Migrate cpp experimental/semmle folder to lib

Also, fix up some library path dependencies.
---
 .../cpp/models/interfaces/SimpleRangeAnalysisDefinition.qll   | 0
 .../code/cpp/models/interfaces/SimpleRangeAnalysisExpr.qll    | 0
 .../semmle/code/cpp/rangeanalysis/ArrayLengthAnalysis.qll     | 0
 .../experimental/semmle/code/cpp/rangeanalysis/Bound.qll      | 0
 .../semmle/code/cpp/rangeanalysis/ExtendedRangeAnalysis.qll   | 0
 .../semmle/code/cpp/rangeanalysis/InBoundsPointerDeref.qll    | 0
 .../semmle/code/cpp/rangeanalysis/RangeAnalysis.qll           | 0
 .../experimental/semmle/code/cpp/rangeanalysis/RangeUtils.qll | 0
 .../semmle/code/cpp/rangeanalysis/SignAnalysis.qll            | 0
 .../rangeanalysis/extensions/ConstantBitwiseAndExprRange.qll  | 0
 .../semmle/code/cpp/rangeanalysis/extensions/SubtractSelf.qll | 0
 .../semmle/code/cpp/security/PrivateCleartextWrite.qll        | 0
 .../experimental/semmle/code/cpp/security/PrivateData.qll     | 0
 .../Security/CWE/CWE-190/semmle/tainted/qlpack.yml            | 4 +++-
 14 files changed, 3 insertions(+), 1 deletion(-)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisDefinition.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisExpr.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/rangeanalysis/ArrayLengthAnalysis.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/rangeanalysis/Bound.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/rangeanalysis/ExtendedRangeAnalysis.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/rangeanalysis/InBoundsPointerDeref.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/rangeanalysis/RangeUtils.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/rangeanalysis/SignAnalysis.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/rangeanalysis/extensions/ConstantBitwiseAndExprRange.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/rangeanalysis/extensions/SubtractSelf.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/security/PrivateCleartextWrite.qll (100%)
 rename cpp/ql/{src => lib}/experimental/semmle/code/cpp/security/PrivateData.qll (100%)

diff --git a/cpp/ql/src/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisDefinition.qll b/cpp/ql/lib/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisDefinition.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisDefinition.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisDefinition.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisExpr.qll b/cpp/ql/lib/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisExpr.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisExpr.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/models/interfaces/SimpleRangeAnalysisExpr.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/ArrayLengthAnalysis.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/ArrayLengthAnalysis.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/ArrayLengthAnalysis.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/ArrayLengthAnalysis.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/Bound.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/Bound.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/Bound.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/Bound.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/ExtendedRangeAnalysis.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/ExtendedRangeAnalysis.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/ExtendedRangeAnalysis.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/ExtendedRangeAnalysis.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/InBoundsPointerDeref.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/InBoundsPointerDeref.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/InBoundsPointerDeref.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/InBoundsPointerDeref.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/RangeAnalysis.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/RangeUtils.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/RangeUtils.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/RangeUtils.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/RangeUtils.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/SignAnalysis.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/SignAnalysis.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/SignAnalysis.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/SignAnalysis.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/extensions/ConstantBitwiseAndExprRange.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/extensions/ConstantBitwiseAndExprRange.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/extensions/ConstantBitwiseAndExprRange.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/extensions/ConstantBitwiseAndExprRange.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/extensions/SubtractSelf.qll b/cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/extensions/SubtractSelf.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/rangeanalysis/extensions/SubtractSelf.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/rangeanalysis/extensions/SubtractSelf.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/security/PrivateCleartextWrite.qll b/cpp/ql/lib/experimental/semmle/code/cpp/security/PrivateCleartextWrite.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/security/PrivateCleartextWrite.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/security/PrivateCleartextWrite.qll
diff --git a/cpp/ql/src/experimental/semmle/code/cpp/security/PrivateData.qll b/cpp/ql/lib/experimental/semmle/code/cpp/security/PrivateData.qll
similarity index 100%
rename from cpp/ql/src/experimental/semmle/code/cpp/security/PrivateData.qll
rename to cpp/ql/lib/experimental/semmle/code/cpp/security/PrivateData.qll
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml
index 9dbd54c1058..6bbb2bc9062 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml
@@ -1,6 +1,8 @@
 # This directory has its own qlpack for reasons detailed in commit 2550788598010fa2117274607c9d58f64f997f34
 name: codeql-cpp-tests-cwe-190-tainted
 version: 0.0.0
-libraryPathDependencies: codeql/cpp-all
+dependencies:
+  codeql/cpp-all: "*"
+  codeql/cpp-queries: "*"
 extractor: cpp
 tests: .