Win32 installer changes to 0.4.0

Signed-off-by: Martin Ribelotta <[email protected]>
martinribelotta · Mar 28, 2017 · 6606273 · 6606273
1 parent 6b4d9bc
commit 6606273
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 47 deletions.
diff --git a/win32/build.bat b/win32/build.bat
@@ -1,20 +1,12 @@
 @echo off
+set QTIFW=C:\Qt\QtIFW2.0.3\bin\
+
 set BASE=%~dp0
 set BASE_MSYS=%BASE%\msys
-set PATH=%BASE%\bin
-
-mingw-get update
-
-set packages=
-SetLocal EnableDelayedExpansion
-for /F "delims=" %%i in (packages.txt) do set packages=!packages! %%i
-
-echo Installing %packages%
-mingw-get install %packages%
-EndLocal
+set PATH=%BASE%\bin;%QTIFW%
+set INSTALLER_PATH=%BASE%\installer
 
-:1
-copy/Y msys.bat.in %BASE%\msys\msys.bat
+call build-msys.bat
 
 set PATH=%BASE%\msys\bin
 %BASE%\msys\bin\bash stage2.sh

diff --git a/win32/installer/build.bat b/win32/installer/build.bat
@@ -1,2 +1,2 @@
-C:\Qt\QtIFW2.0.3\bin\binarycreator.exe -p packages -c config\config.xml -v embedded-ide-0.3.4.exe
+C:\Qt\QtIFW2.0.3\bin\binarycreator.exe -p packages -c config\config.xml -v embedded-ide-0.4.0.exe
 @pause
diff --git a/win32/installer/config/config.xml b/win32/installer/config/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>Embedded IDE</Name>
-    <Version>0.3.4</Version>
+    <Version>0.4.0</Version>
     <Title>Embedded IDE Installer</Title>
     <Publisher>Rusotech</Publisher>
     <StartMenuDir>Embedded IDE</StartMenuDir>

diff --git a/win32/installer/packages/org.rusotech.embedded_ide/meta/package.xml b/win32/installer/packages/org.rusotech.embedded_ide/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>Embedded IDE</DisplayName>
     <Description>Core System for IDE</Description>
-    <Version>0.2.0</Version>
-    <ReleaseDate>2016-12-12</ReleaseDate>
+    <Version>0.4.0</Version>
+    <ReleaseDate>2017-03-28</ReleaseDate>
     <Default>true</Default>
     <ForcedInstallation>true</ForcedInstallation>
     <SortingPriority>1000</SortingPriority>

diff --git a/win32/stage2.sh b/win32/stage2.sh
@@ -1,44 +1,56 @@
 #!/bin/sh
 
-get_and_unzip () {
-echo Getting $1 from $2 to $3
-if [ -f $1 ]
-then
-    echo "Already download"
-else
-    echo "Downloading"
-    wget --no-check-certificate -O $1 $2
-fi
-if [ -d $3 ]
-then
-    echo "Already unzip"
-else
-    echo "mkdir and unzip"
-    mkdir $3 && unzip -d $3 $1
-fi
+get_unzip_re7z_and_store () {
+    D=$INSTALLER_PATH/packages/$4/data
+    echo Getting $1 from $2 to $3 repacket to pkg $4
+    if [ -f $1 ]
+    then
+        echo "Already download"
+    else
+        echo "Downloading"
+        wget --no-check-certificate -O $1 $2
+    fi
+    if [ -d $3 ]
+    then
+        echo "Already unzip"
+    else
+        echo "mkdir and unzip"
+        mkdir $3 && unzip -d $3 $1
+    fi
 }
 
-#export GCC_URL=https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q3-update/+download/gcc-arm-none-eabi-5_4-2016q3-20160926-win32.zip
-export GCC_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/6_1-2017q1/gcc-arm-none-eabi-6-2017-q1-update-win32.zip
-export GCC_LOCAL=$(basename $GCC_URL)
-export GCC_LOCAL_DIR=$BASE_MSYS/gcc-arm-embedded
+get_and_store_pkg () {
+    D=$INSTALLER_PATH/packages/$2/data
+    echo Getting $1 from package $2 ($D)
+    if [ -f $1 ]
+    then
+        echo "Already download"
+    else
+        echo "Downloading"
+        wget --no-check-certificate -O $1 $D
+    fi
+}
 
-get_and_unzip $GCC_LOCAL $GCC_URL $GCC_LOCAL_DIR
+if false; then
+    export GCC_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/6_1-2017q1/gcc-arm-none-eabi-6-2017-q1-update-win32.zip
+    export GCC_LOCAL=$(basename $GCC_URL)
+    export GCC_LOCAL_TMP_DIR=$BASE/gcc-arm-embedded
+    export GCC_LOCAL_DIR=$BASE_MSYS/gcc-arm-embedded
 
-#test -f $GCC_LOCAL || $WGET_CMD -O $GCC_LOCAL $GCC_URL
-#test -d $GCC_LOCAL_DIR || $(mkdir $GCC_LOCAL_DIR && unzip -d $GCC_LOCAL_DIR $GCC_LOCAL)
+    get_unzip_re7z_and_store $GCC_LOCAL $GCC_URL $GCC_LOCAL_DIR
+fi
 
-export OOCD_URL=http://none.at/openocd-0.10-repacket.zip
-export OOCD_LOCAL=local/$(basename $OOCD_URL)
-export OOCD_LOCAL_DIR=$BASE_MSYS/oocd
+export OOCD_URL=http://www.freddiechopin.info/en/download/category/4-openocd?download=154%3Aopenocd-0.10.0
+export OOCD_LOCAL=openocd-0.10.0.7z
+export OOCD_LOCAL_PKG=org.nongnu.openocd
 
-get_and_unzip $OOCD_LOCAL $OOCD_URL $OOCD_LOCAL_DIR
+get_and_store $OOCD_LOCAL $OOCD_URL $OOCD_LOCAL_PKG
 
-export EIDE_URL=https://github.com/martinribelotta/embedded-ide/releases/download/v0.3-rc4-inet/embedded-ide-v0.3-rc4.zip
+export EIDE_URL=https://github.com/martinribelotta/embedded-ide/releases/download/v0.4.0/embedded-ide-v0.4.0-win32.7z
 export EIDE_LOCAL=$(basename $EIDE_URL)
-export EIDE_LOCAL_DIR=$BASE_MSYS/embedded-ide
+export EIDE_LOCAL_PKG=org.rusotech.embedded_ide
 
-get_and_unzip $EIDE_LOCAL $EIDE_URL $EIDE_LOCAL_DIR
+get_and_unzip $EIDE_LOCAL $EIDE_URL $EIDE_LOCAL_PKG
 
 test -d /etc/profile.d || mkdir /etc/profile.d