From 62e5c4a687ece15f0a62ae3c1b7694c4ef1673b9 Mon Sep 17 00:00:00 2001
From: f00f <582746+f00f@users.noreply.github.com>
Date: Tue, 2 Apr 2019 12:33:02 +0200
Subject: [PATCH] Orbbec: Move OpenNI version into a deployed .props file
(#192)
---
.../OrbbecOpenNI/MetriCam2.Orbbec.props | 15 +++++++
BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj | 40 +++++++++++--------
Scripts/Jenkinsfile.groovy | 8 ++++
3 files changed, 47 insertions(+), 16 deletions(-)
create mode 100644 BetaCameras/OrbbecOpenNI/MetriCam2.Orbbec.props
diff --git a/BetaCameras/OrbbecOpenNI/MetriCam2.Orbbec.props b/BetaCameras/OrbbecOpenNI/MetriCam2.Orbbec.props
new file mode 100644
index 00000000..e3358870
--- /dev/null
+++ b/BetaCameras/OrbbecOpenNI/MetriCam2.Orbbec.props
@@ -0,0 +1,15 @@
+
+
+
+
+ 2.3.0.55
+
+
+
+
+
+ $(OrbbecOpenNIVersion)
+ true
+
+
+
\ No newline at end of file
diff --git a/BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj b/BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj
index 917e03f7..3650fe7b 100644
--- a/BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj
+++ b/BetaCameras/OrbbecOpenNI/OrbbecOpenNI.vcxproj
@@ -111,34 +111,42 @@
+
+
+
+
+
+
+
+
@@ -201,14 +209,14 @@
Disabled
WIN32;_DEBUG;%(PreprocessorDefinitions)
Use
- Z:\external-libraries\Orbbec\OpenNI2\2.3.0.55\Include;%(AdditionalIncludeDirectories)
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories)
true
OpenNI2.lib;%(AdditionalDependencies)
- Z:\external-libraries\Orbbec\OpenNI2\2.3.0.55\Lib
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib
OrbbecIcon.ico;%(EmbedManagedResourceFile)
@@ -220,14 +228,14 @@
Disabled
WIN32;_DEBUG;%(PreprocessorDefinitions)
Use
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\Include;%(AdditionalIncludeDirectories)
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories)
true
OpenNI2.lib;%(AdditionalDependencies)
- Z:\external-libraries\Orbbec\OpenNI2\2.3.0.55\Lib
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib
OrbbecIcon.ico;%(EmbedManagedResourceFile)
@@ -239,11 +247,11 @@
Disabled
WIN32;_DEBUG;%(PreprocessorDefinitions)
Use
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\Include;%(AdditionalIncludeDirectories)
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories)
OpenNI2.lib;%(AdditionalDependencies)
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\x86-Release
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib
@@ -252,11 +260,11 @@
Disabled
WIN32;_DEBUG;%(PreprocessorDefinitions)
Use
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\Include;%(AdditionalIncludeDirectories)
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories)
OpenNI2.lib;%(AdditionalDependencies)
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\x86-Release
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib
@@ -264,13 +272,13 @@
Level3
WIN32;NDEBUG;%(PreprocessorDefinitions)
NotUsing
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\Include;%(AdditionalIncludeDirectories)
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories)
true
true
OpenNI2.lib;%(AdditionalDependencies)
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\x86-Release
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib
true
UseFastLinkTimeCodeGeneration
@@ -280,13 +288,13 @@
Level3
WIN32;NDEBUG;%(PreprocessorDefinitions)
NotUsing
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\Include;%(AdditionalIncludeDirectories)
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories)
true
true
OpenNI2.lib;%(AdditionalDependencies)
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\x86-Release
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib
true
UseFastLinkTimeCodeGeneration
@@ -296,12 +304,12 @@
Level3
WIN32;NDEBUG;%(PreprocessorDefinitions)
NotUsing
- Z:\external-libraries\Orbbec\OpenNI2\2.3.0.55\Include;%(AdditionalIncludeDirectories)
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories)
true
OpenNI2.lib;%(AdditionalDependencies)
- Z:\external-libraries\Orbbec\OpenNI2\2.3.0.55\Lib
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib
UseLinkTimeCodeGeneration
OrbbecIcon.ico;%(EmbedManagedResourceFile)
@@ -311,12 +319,12 @@
Level3
WIN32;NDEBUG;%(PreprocessorDefinitions)
NotUsing
- Z:\external-libraries\Orbbec\OpenNI2\2.3.1.48\windows\Include;%(AdditionalIncludeDirectories)
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Include;%(AdditionalIncludeDirectories)
true
OpenNI2.lib;%(AdditionalDependencies)
- Z:\external-libraries\Orbbec\OpenNI2\2.3.0.55\Lib
+ Z:\external-libraries\Orbbec\OpenNI2\$(OrbbecOpenNIVersion)\Lib
UseLinkTimeCodeGeneration
OrbbecIcon.ico;%(EmbedManagedResourceFile)
diff --git a/Scripts/Jenkinsfile.groovy b/Scripts/Jenkinsfile.groovy
index 99f5dfeb..c26c7c6a 100644
--- a/Scripts/Jenkinsfile.groovy
+++ b/Scripts/Jenkinsfile.groovy
@@ -124,6 +124,10 @@ pipeline {
if errorlevel 1 GOTO StepFailed
COPY /Y "%DEBUG_DIR_X64%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixDebug%"
)
+ COPY /Y "BetaCameras\\OrbbecOpenNI\\MetriCam2.Orbbec.props" "%releaseLibraryDirectory%"
+ if errorlevel 1 GOTO StepFailed
+ COPY /Y "BetaCameras\\OrbbecOpenNI\\MetriCam2.Orbbec.props" "%releaseLibraryDirectory%%releaseSuffixDebug%"
+ if errorlevel 1 GOTO StepFailed
FOR %%p IN (%dllsToDeployAnyCPU%) DO (
COPY /Y "%RELEASE_DIR_ANYCPU%%%p.dll" "%releaseLibraryDirectory%"
if errorlevel 1 GOTO StepFailed
@@ -151,6 +155,10 @@ pipeline {
if errorlevel 1 GOTO StepFailed
COPY /Y "%DEBUG_DIR_X64_STRONGNAME%%%p.pdb" "%releaseLibraryDirectory%%releaseSuffixStrongName%%releaseSuffixDebug%"
)
+ COPY /Y "BetaCameras\\OrbbecOpenNI\\MetriCam2.Orbbec.props" "%releaseLibraryDirectory%%releaseSuffixStrongName%"
+ if errorlevel 1 GOTO StepFailed
+ COPY /Y "BetaCameras\\OrbbecOpenNI\\MetriCam2.Orbbec.props" "%releaseLibraryDirectory%%releaseSuffixStrongName%%releaseSuffixDebug%"
+ if errorlevel 1 GOTO StepFailed
FOR %%p IN (%dllsToDeployAnyCPUStrongName%) DO (
COPY /Y "%RELEASE_DIR_ANYCPU_STRONGNAME%%%p.dll" "%releaseLibraryDirectory%%releaseSuffixStrongName%"
if errorlevel 1 GOTO StepFailed