Merge pull request biolab#1293 from ales-erjavec/win-installer-proj-n…

…ame-fix [FIX] Fix windows installer build scripts due to changed project name
astaric · Jun 1, 2016 · 9395330 · 9395330
2 parents 3b245e1 + 77221f4
commit 9395330
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/scripts/windows/build-win-application.sh b/scripts/windows/build-win-application.sh
@@ -280,18 +280,17 @@ function prepare_orange {
     # can be installed with pip v7.* (wheel issue #165, #159) which is the
     # version installed by ensurepip for Python 3.4.4
     pip install 'wheel==0.26.*'
-    python setup.py egg_info
-    local version=$(grep -E "^Version: .*$" Orange.egg-info/PKG-INFO | awk '{ print $2 }')
-
-    python setup.py egg_info \
+    local version=$(python setup.py --version)
+    local name=$(python setup.py --name)
+    python setup.py  \
         build --compiler=msvc \
         bdist_wheel -d "$BUILDBASE/wheelhouse"
 
     # Ensure all install dependencies are available in the wheelhouse
     prepare_req --only-binary numpy,scipy,scikit-learn,bottlechest .
 
     echo "# Orange " >> "$BUILDBASE/requirements.txt"
-    echo "Orange==$version" >> "$BUILDBASE/requirements.txt"
+    echo "$name==$version" >> "$BUILDBASE/requirements.txt"
 }
 
 function prepare_extra {
@@ -397,7 +396,7 @@ function create_installer {
 # Prepare prerequisites
 prepare_all
 
-VERSION=$(grep -E "^Orange==" "$BUILDBASE/requirements.txt" | sed s/^Orange==//g)
+VERSION=$(python setup.py --version)
 
 # Package everything in an installer
 if [[ $STANDALONE ]]; then

diff --git a/scripts/windows/install-standalone.nsi b/scripts/windows/install-standalone.nsi
@@ -171,7 +171,7 @@ Section "Main"
 
 	DetailPrint "Installing Orange"
 	${Pip} 'install --no-deps --no-index \
-			-f "${TEMPDIR}\wheelhouse" Orange'
+			-f "${TEMPDIR}\wheelhouse" Orange3'
 
 	Pop $0
 	${If} $0 != 0

diff --git a/scripts/windows/install.nsi b/scripts/windows/install.nsi
@@ -129,7 +129,7 @@ Section ""
 
 	DetailPrint "Installing Orange"
 	${Pip} 'install --no-deps --no-index \
-			-f "${TEMPDIR}\wheelhouse" Orange'
+			-f "${TEMPDIR}\wheelhouse" Orange3'
 
 	Pop $0
 	${If} $0 != 0
@@ -195,7 +195,7 @@ Section Uninstall
 
 	ReadRegStr $PythonDir SHELL_CONTEXT Software\OrangeCanvas\Current "PythonDir"
 
-	${PythonExec} "-m pip uninstall -y Orange"
+	${PythonExec} "-m pip uninstall -y Orange3"
 
 	RmDir /R $PythonDir\share\Orange