ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [15/18] incubator-ignite git commit: # sprint-2 Fixed os path.
Date Wed, 18 Feb 2015 03:26:32 GMT
# sprint-2 Fixed os path.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3021ef8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3021ef8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3021ef8d

Branch: refs/heads/ignite-275
Commit: 3021ef8d041932ce393fd7f581197ad85e06c795
Parents: fd06847
Author: anovikov <anovikov@gridgain.com>
Authored: Tue Feb 17 21:47:48 2015 +0700
Committer: anovikov <anovikov@gridgain.com>
Committed: Tue Feb 17 21:47:48 2015 +0700

----------------------------------------------------------------------
 bin/include/target-classpath.bat |  4 +++-
 bin/include/target-classpath.sh  | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3021ef8d/bin/include/target-classpath.bat
----------------------------------------------------------------------
diff --git a/bin/include/target-classpath.bat b/bin/include/target-classpath.bat
index 423f984..bd304c1 100644
--- a/bin/include/target-classpath.bat
+++ b/bin/include/target-classpath.bat
@@ -25,7 +25,7 @@
 
 @echo off
 
-for /D %%F in (%IGNITE_HOME%\os\modules\*) do if not %%F == "%IGNITE_HOME%\os\modules" call
:includeToClassPath %%F
+for /D %%F in (modules\*) do if not %%F == "modules" call :includeToClassPath %%F
 
 for /D %%F in (%IGNITE_HOME%\modules\*) do if not %%F == "%IGNITE_HOME%\modules" call :includeToClassPath
%%F
 
@@ -35,6 +35,8 @@ goto :eof
 if exist "%1\target\" (
     if exist "%1\target\classes\" call :concat %1\target\classes
 
+    if exist "%1\target\test-classes\" call :concat %1\target\test-classes
+
     if exist "%1\target\libs\" call :concat %1\target\libs\*
 )
 goto :eof

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3021ef8d/bin/include/target-classpath.sh
----------------------------------------------------------------------
diff --git a/bin/include/target-classpath.sh b/bin/include/target-classpath.sh
index 03aa951..62c9ffa 100644
--- a/bin/include/target-classpath.sh
+++ b/bin/include/target-classpath.sh
@@ -49,6 +49,10 @@ includeToClassPath() {
                 IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/classes
             fi
 
+            if [ -d "${file}/target/test-classes" ]; then
+                IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/test-classes
+            fi
+
             if [ -d "${file}/target/libs" ]; then
                 IGNITE_LIBS=${IGNITE_LIBS}${SEP}${file}/target/libs/*
             fi
@@ -57,11 +61,11 @@ includeToClassPath() {
 }
 
 #
-# Include target libraries for opensourse modules to classpath.
+# Include target libraries for enterprise modules to classpath.
 #
-includeToClassPath ${IGNITE_HOME}/os/modules
+includeToClassPath modules
 
 #
-# Include target libraries for enterprise modules to classpath.
+# Include target libraries for opensourse modules to classpath.
 #
 includeToClassPath ${IGNITE_HOME}/modules


Mime
View raw message