Repository: geode-native
Updated Branches:
  refs/heads/develop b6d9cc3a9 -> 53a912bef


GEODE-3168: Fixes Windows CLI projects.

- Corrects project paths.
- Corrects Debug/Release paths in tests.


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/53a912be
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/53a912be
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/53a912be

Branch: refs/heads/develop
Commit: 53a912bef84a42bb4dd37b4590a80de3626e76a1
Parents: b6d9cc3
Author: Jacob Barrett <jbarr...@pivotal.io>
Authored: Wed Jul 5 19:51:03 2017 +0000
Committer: Jacob Barrett <jbarr...@pivotal.io>
Committed: Wed Jul 5 13:51:38 2017 -0700

----------------------------------------------------------------------
 .../integration-test/UnitTests.csproj.in        |  7 +-----
 src/clicache/integration-test/test.bat.in       | 24 ++++++++++----------
 src/plugins/SQLiteCLI/CMakeLists.txt            |  4 ++--
 src/tests/cli/CMakeLists.txt                    |  5 +++-
 4 files changed, 19 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/53a912be/src/clicache/integration-test/UnitTests.csproj.in
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/UnitTests.csproj.in 
b/src/clicache/integration-test/UnitTests.csproj.in
index b505388..a670c9c 100644
--- a/src/clicache/integration-test/UnitTests.csproj.in
+++ b/src/clicache/integration-test/UnitTests.csproj.in
@@ -574,7 +574,7 @@
     <Content Include="authz-ldap.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\plugins\SQLiteCLI\SQLiteCLI.csproj">
+    <ProjectReference 
Include="$(CMAKE_BINARY_DIR)\plugins\SQLiteCLI\SQLiteCLI.csproj">
       <Project>{FF9597E3-A4DD-4FDE-871D-B0C66088762F}</Project>
       <Name>SQLiteCLI</Name>
     </ProjectReference>
@@ -607,11 +607,6 @@
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
       <Name>QueryWrapper</Name>
     </ProjectReference>
-    <ProjectReference 
Include="$(CMAKE_BINARY_DIR)\tests\cli\NativeWrapper\NativeWrapper.vcxproj">
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <Name>NativeWrapper</Name>
-    </ProjectReference>
     <ProjectReference 
Include="$(CMAKE_BINARY_DIR)\tests\cli\SecurityUtil\SecurityUtil.csproj">
       <Project>{29CFC13C-1D6C-4FE8-B56E-A5E7BA7F849F}</Project>
       <Name>SecurityUtil</Name>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/53a912be/src/clicache/integration-test/test.bat.in
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/test.bat.in 
b/src/clicache/integration-test/test.bat.in
index 7562837..e306603 100644
--- a/src/clicache/integration-test/test.bat.in
+++ b/src/clicache/integration-test/test.bat.in
@@ -17,7 +17,7 @@ rem limitations under the License.
 
 setlocal
 
-set PATH=$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:apache-geode>>;%PATH%
+set PATH=$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:Apache.Geode>>;%PATH%
 set PATH=$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:framework>>;%PATH%
 set PATH=$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:testobject>>;%PATH%
 set PATH=$<SHELL_PATH:$<TARGET_LINKER_FILE_DIR:SqLiteImpl>>;%PATH%
@@ -29,34 +29,34 @@ set PATH=$<JOIN:$<SHELL_PATH:${PATH}>,;>;%PATH%
 
 set PATH=c:\Program Files (x86)\Nunit 2.6.4\bin;%PATH%
 
-rem TODO: Figure out why this is needed
-set GFCPP=c:\
+set TEST_DIR="$<SHELL_PATH:${TEST_DIR}>"
+set GFCPP="%TEST_DIR%"
 
-set TESTSRC=${CMAKE_CURRENT_SOURCE_DIR}
-set GF_JAVA=${Java_JAVA_EXECUTABLE}
-set GFJAVA=${Geode_PATH}
+set TESTSRC=$<SHELL_PATH:${CMAKE_CURRENT_SOURCE_DIR}>
+set GF_JAVA=$<SHELL_PATH:${Java_JAVA_EXECUTABLE}>
+set GFJAVA=$<SHELL_PATH:${Geode_PATH}>
 set GFE_LOGLEVEL=config
 set GFE_SECLOGLEVEL=config
-set GFE_DIR=${Geode_PATH}
+set GFE_DIR=$<SHELL_PATH:${Geode_PATH}>
 set MCAST_ADDR=224.10.13.63
 set MCAST_PORT=${PORT}
 set TIMEBOMB=3600
-set 
GF_CLASSPATH=%GF_CLASSPATH%;${CMAKE_BINARY_DIR}/tests/javaobject/javaobject.jar
+set 
GF_CLASSPATH=%GF_CLASSPATH%;$<SHELL_PATH:${CMAKE_BINARY_DIR}>\tests\javaobject\javaobject.jar
 set PROFILERCMD=
 set BUG481=
 set TESTNAME=${TEST}
 set LOG=${TEST}.log
 
-rmdir /q /s "${TEST_DIR}" 2>nul
-mkdir "${TEST_DIR}"
+rmdir /q /s "%TEST_DIR%" 2>nul
+mkdir "%TEST_DIR%"
 if %errorlevel% neq 0 exit /b %errorlevel%
-pushd "${TEST_DIR}"
+pushd "%TEST_DIR%"
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 rem In Windows, pipes to tee return tee's exit code instead of executable's
 rem exit code. As a workaround we write exit codes to files.
 
-(${NUNIT_CONSOLE} /run:${NAMESPACE}.${TESTCLASS} 
..\..\${CMAKE_BUILD_TYPE}\UnitTests.dll 2>&1 && echo 0 >${TEST}.errorlevel || 
echo 1 >${TEST}.errorlevel) | tee %LOG%
+(${NUNIT_CONSOLE} /run:${NAMESPACE}.${TESTCLASS} ..\..\$<CONFIG>\UnitTests.dll 
2>&1 && echo 0 >${TEST}.errorlevel || echo 1 >${TEST}.errorlevel) | tee %LOG%
 
 set /p errorlevel= <${TEST}.errorlevel
 if %errorlevel% neq 0 exit /b %errorlevel%

http://git-wip-us.apache.org/repos/asf/geode-native/blob/53a912be/src/plugins/SQLiteCLI/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/plugins/SQLiteCLI/CMakeLists.txt 
b/src/plugins/SQLiteCLI/CMakeLists.txt
index e735090..4224a1a 100644
--- a/src/plugins/SQLiteCLI/CMakeLists.txt
+++ b/src/plugins/SQLiteCLI/CMakeLists.txt
@@ -22,7 +22,7 @@ foreach(var CMAKE_CURRENT_SOURCE_DIR CMAKE_SOURCE_DIR 
CMAKE_BINARY_DIR CMAKE_CUR
   file(TO_NATIVE_PATH ${${var}} ${var}_NATIVE)
 endforeach()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/SQLiteCLI.csproj.in 
${CMAKE_CURRENT_BINARY_DIR}/SQLiteCLI/SQLiteCLI.csproj)  
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/SQLiteCLI.csproj.in 
${CMAKE_CURRENT_BINARY_DIR}/SQLiteCLI.csproj)  
 include_external_msproject(
-      SQLiteCLI  ${CMAKE_CURRENT_BINARY_DIR}/SQLiteCLI/SQLiteCLI.csproj
+      SQLiteCLI  ${CMAKE_CURRENT_BINARY_DIR}/SQLiteCLI.csproj
       TYPE FAE04EC0-301F-11D3-BF4B-00C04F79EFBC)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/53a912be/src/tests/cli/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/cli/CMakeLists.txt b/src/tests/cli/CMakeLists.txt
index a7cb225..2891685 100644
--- a/src/tests/cli/CMakeLists.txt
+++ b/src/tests/cli/CMakeLists.txt
@@ -22,8 +22,10 @@ set (NUNIT "C:\\Program Files (x86)\\NUnit 2.6.4")
 
 if (64 EQUAL ${BUILD_BITS})
   set (NUNIT_CONSOLE "nunit-console")
+  set (PLATFORM x64)
 else()
   set (NUNIT_CONSOLE "nunit-console-x86")
+  set (PLATFORM x86)
 endif()
 
 # Set the .NET Target Framework (Note: This should match the build for 
Apache.Geode.)
@@ -45,7 +47,8 @@ foreach(FILE ${CSPROJECTS})
   configure_file(${FILE} 
${CMAKE_CURRENT_BINARY_DIR}/${PROJNAME}/${PROJNAME}.csproj)
   include_external_msproject(
       ${PROJNAME}  ${CMAKE_CURRENT_BINARY_DIR}/${PROJNAME}/${PROJNAME}.csproj
-      TYPE FAE04EC0-301F-11D3-BF4B-00C04F79EFBC)
+      TYPE FAE04EC0-301F-11D3-BF4B-00C04F79EFBC
+         PLATFORM ${PLATFORM})
   set_target_properties(${PROJNAME} PROPERTIES FOLDER test/cliTests)
 
 endforeach()
\ No newline at end of file

Reply via email to