From 5b67c77b12bc905eeb3789c0fb5fd0bead9ff3e2 Mon Sep 17 00:00:00 2001
From: petrush <petrus.hyvonen@sscspace.com>
Date: Mon, 18 Sep 2017 18:57:40 +0200
Subject: [PATCH] Pythonwrapper build scripts
---
orekit-conda-recipe/CHANGES.txt | 4 +++
orekit-conda-recipe/bld.bat | 56 ++++++++++++++++++---------------
orekit-conda-recipe/build.sh | 34 ++++++++++----------
3 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/orekit-conda-recipe/CHANGES.txt b/orekit-conda-recipe/CHANGES.txt
index 6422a32..826adfc 100644
--- a/orekit-conda-recipe/CHANGES.txt
+++ b/orekit-conda-recipe/CHANGES.txt
@@ -1,5 +1,9 @@
Changelog python orekit package
+2017-08-24 Version 9.0 Build 0
+- Updated to orekit v9.0 release version
+- First build on python 3
+
2016-11-13 Version 8.0 Build 1
- Corrected the datetime to absolute conversions, microseconds was incorrectly converted
diff --git a/orekit-conda-recipe/bld.bat b/orekit-conda-recipe/bld.bat
index e4255c6..9257e40 100644
--- a/orekit-conda-recipe/bld.bat
+++ b/orekit-conda-recipe/bld.bat
@@ -1,19 +1,22 @@
+:: set JCC_JDK=%JAVA_HOME
-set
+:: set PATH=%JCC_JDK%\jre\bin\server;%JCC_JDK%;%JCC_JDK%\bin;%JCC_JDK%\lib;%JCC_JDK%\include;%PATH%
+:: set JDK_HOME=%JCC_JDK%
+:: set
"%PYTHON%" -m jcc ^
--use_full_names ^
--python orekit ^
---version 8.0 ^
---jar %RECIPE_DIR%\orekit-8.1-SNAPSHOT.jar ^
---jar %RECIPE_DIR%\hipparchus-core-1.0.jar ^
---jar %RECIPE_DIR%\hipparchus-fitting-1.0.jar ^
---jar %RECIPE_DIR%\hipparchus-geometry-1.0.jar ^
---jar %RECIPE_DIR%\hipparchus-ode-1.0.jar ^
---jar %RECIPE_DIR%\hipparchus-optim-1.0.jar ^
---jar %RECIPE_DIR%\hipparchus-stat-1.0.jar ^
+--version 9.0 ^
+--jar %RECIPE_DIR%\orekit-9.0.jar ^
+--jar %RECIPE_DIR%\hipparchus-core-1.1.jar ^
+--jar %RECIPE_DIR%\hipparchus-fitting-1.1.jar ^
+--jar %RECIPE_DIR%\hipparchus-geometry-1.1.jar ^
+--jar %RECIPE_DIR%\hipparchus-ode-1.1.jar ^
+--jar %RECIPE_DIR%\hipparchus-optim-1.1.jar ^
+--jar %RECIPE_DIR%\hipparchus-stat-1.1.jar ^
--package java.io ^
--package java.util ^
--package java.text ^
@@ -59,26 +62,27 @@ if errorlevel 1 exit 1
:: Add PATH to anaconda java-jdk / jre
-echo import os > header.txt
-echo os.environ["PATH"] = r"%PREFIX%\Library\jre\bin\server" + os.pathsep + os.environ["PATH"] >> header.txt
+:: echo import os > header.txt
+:: echo os.environ["PATH"] = r"%PREFIX%\Library\jre\bin\server" + os.pathsep + os.environ["PATH"] >> header.txt
-IF "%ARCH%"=="32" (
+
+:: IF "%ARCH%"=="32" (
::win32 ARCH == 32
- type %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\__init__.py >> header.txt
- del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\__init__.py
- del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\__init__.pyc
- ren header.txt __init__.py
- move __init__.py %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win32.egg\%PKG_NAME%\
-)
+:: type %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-%PKG_BUILD_STRING:~0,3%.%PKG_BUILD_STRING:~3,1%-win32.egg\%PKG_NAME%\__init__.py >> header.txt
+:: del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-%PKG_BUILD_STRING:~0,3%.%PKG_BUILD_STRING:~3,1%-win32.egg\%PKG_NAME%\__init__.py
+:: del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-%PKG_BUILD_STRING:~0,3%.%PKG_BUILD_STRING:~3,1%-win32.egg\%PKG_NAME%\__init__.pyc
+:: ren header.txt __init__.py
+:: move __init__.py %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-%PKG_BUILD_STRING:~0,3%.%PKG_BUILD_STRING:~3,1%-win32.egg\%PKG_NAME%\
+::)
-IF "%ARCH%"=="64" (
- ::amd64
- type %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\__init__.py >> header.txt
- del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\__init__.py
- del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\__init__.pyc
- ren header.txt __init__.py
- move __init__.py %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-py2.7-win-amd64.egg\%PKG_NAME%\
-)
+::IF "%ARCH%"=="64" (
+:: ::amd64
+:: type %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-%PKG_BUILD_STRING:~0,3%.%PKG_BUILD_STRING:~3,1%-win-amd64.egg\%PKG_NAME%\__init__.py >> header.txt
+:: del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-%PKG_BUILD_STRING:~0,3%.%PKG_BUILD_STRING:~3,1%-win-amd64.egg\%PKG_NAME%\__init__.py
+:: del %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-%PKG_BUILD_STRING:~0,3%.%PKG_BUILD_STRING:~3,1%-win-amd64.egg\%PKG_NAME%\__init__.pyc
+:: ren header.txt __init__.py
+:: move __init__.py %SP_DIR%\%PKG_NAME%-%PKG_VERSION%-%PKG_BUILD_STRING:~0,3%.%PKG_BUILD_STRING:~3,1%-win-amd64.egg\%PKG_NAME%\
+:: )
:: See
:: http://docs.continuum.io/conda/build.html
diff --git a/orekit-conda-recipe/build.sh b/orekit-conda-recipe/build.sh
index eb6584b..8525fbf 100644
--- a/orekit-conda-recipe/build.sh
+++ b/orekit-conda-recipe/build.sh
@@ -3,27 +3,29 @@
# add --shared for building shared version
# classes directly on the list are wrapped as well as the jar's
# This section is setting up the build to use the coda package java-jdk
-export JCC_JDK=$PREFIX
-export JAVA_HOME=$JCC_JDK
-export JAVAHOME=$JCC_JDK
-export LD_LIBRARY_PATH=$PREFIX/jre/lib/amd64/server:$PREFIX/jre/lib/amd64:$LD_LIBRARY_PATH
+#export JCC_JDK=$PREFIX
+#export JAVA_HOME=$JCC_JDK
+#export JAVAHOME=$JCC_JDK
+#export LD_LIBRARY_PATH=$PREFIX/jre/lib/amd64/server:$PREFIX/jre/lib/amd64:$LD_LIBRARY_PATH
-export JCC_ARGSEP=";"
-export JCC_INCLUDES="$PREFIX/include;$PREFIX/include/linux"
-export JCC_LFLAGS="-L$PREFIX/jre/lib/amd64;-ljava;-L$PREFIX/jre/lib/amd64/server;-ljvm;-lverify;-Wl,-rpath=$PREFIX/jre/lib/amd64:$PREFIX/jre/lib/amd64/server"
-export JCC_JAVAC=$PREFIX/bin/javac
+#export JCC_ARGSEP=";"
+#export JCC_INCLUDES="$PREFIX/include;$PREFIX/include/linux"
+#export JCC_LFLAGS="-L$PREFIX/jre/lib/amd64;-ljava;-L$PREFIX/jre/lib/amd64/server;-ljvm;-lverify;-Wl,-rpath=$PREFIX/jre/lib/amd64:$PREFIX/jre/lib/amd64/server"
+#export JCC_JAVAC=$PREFIX/bin/javac
+
+export MACOSX_DEPLOYMENT_TARGET=10.9
$PYTHON -m jcc \
--use_full_names \
--python orekit \
---version 8.0 \
---jar $RECIPE_DIR/orekit-8.1-SNAPSHOT.jar \
---jar $RECIPE_DIR/hipparchus-core-1.0.jar \
---jar $RECIPE_DIR/hipparchus-fitting-1.0.jar \
---jar $RECIPE_DIR/hipparchus-geometry-1.0.jar \
---jar $RECIPE_DIR/hipparchus-ode-1.0.jar \
---jar $RECIPE_DIR/hipparchus-optim-1.0.jar \
---jar $RECIPE_DIR/hipparchus-stat-1.0.jar \
+--version 9.0 \
+--jar $RECIPE_DIR/orekit-9.0.jar \
+--jar $RECIPE_DIR/hipparchus-core-1.1.jar \
+--jar $RECIPE_DIR/hipparchus-fitting-1.1.jar \
+--jar $RECIPE_DIR/hipparchus-geometry-1.1.jar \
+--jar $RECIPE_DIR/hipparchus-ode-1.1.jar \
+--jar $RECIPE_DIR/hipparchus-optim-1.1.jar \
+--jar $RECIPE_DIR/hipparchus-stat-1.1.jar \
--package java.io \
--package java.util \
--package java.text \
--
GitLab