Permalink
Browse files

Started improving our installer scripts and instructions. Got rid of …

…the need to run nsis on the command line to define STARTDIR; we will now assume you are building inside wixel-sdk/installer/build. Added more explicit versioning for the Pololu GNU Build Utilities so we might have the possibility of distributing a standalone installer.
  • Loading branch information...
DavidEGrayson committed Jan 27, 2012
1 parent b4f3ef3 commit b233917c07cd4357438e91658e411628fa7efdbc
Showing with 36 additions and 32 deletions.
  1. +9 −6 installer/README.txt
  2. +6 −13 installer/build_tools.nsi
  3. +11 −0 installer/prepare_sdk.bat
  4. +10 −13 installer/wixel_tools_mui.nsi
View
@@ -14,21 +14,24 @@ First:
1. Install NSIS v2.46+, available from http://nsis.sourceforge.net.
You should add the NSIS installation directory to your path so you
can easily run makensis.
-2. Install the EnvVarUpdate plugin for NSIS, available from
+2. Install the "Large strings" build of NSIS on top of that so we
+ truncate user's paths to 8192 bytes instead of 1024.
+3. Install the EnvVarUpdate plugin for NSIS, available from
http://nsis.sourceforge.net/Environmental_Variables:_append,_prepend,_and_remove_entries
-3. Install Doxygen, available from http://www.stack.nl/~dimitri/doxygen/
-4. Update WIXELTOOLVERSION in wixel_tools_mui.nsi to today's date.
-5. Update TOOLSVER in build_tools.nsi if the Pololu GNU Build
+ EnvVarUpdate.nsh needs to be put in C:\Program Files (x86)\NSIS\include.
+4. Install Doxygen, available from http://www.stack.nl/~dimitri/doxygen/
+5. Update WIXELTOOLVERSION in wixel_tools_mui.nsi to today's date.
+6. Update TOOLSVER in build_tools.nsi if the Pololu GNU Build
Utilities have changed since last time.
Second, create a new folder named "bundle" and assemble the following
in that folder:
1. A folder named "build_tools" that contains the Pololu GNU Build
Utilities.
-2. The SDCC installer (e.g. "sdcc-3.0.0-setup.exe"). The version number
+2. The SDCC installer (renamed to "sdcc-VERSION-setup.exe"). The version number
is specified in the SDCCVER variable in wixel_tools_mui.nsh; update
that variable if needed.
-3. The Notepad++ installer (e.g. "npp.5.9.Installer.exe"). The version
+3. The Notepad++ installer (e.g. "npp.5.9.8.Installer.exe"). The version
number is specified in the NPVER variable in wixel_tools_mui.nsh;
update that variable if needed.
4. The Wixel SDK repository itself, in a folder named "wixel-sdk".
View
@@ -1,22 +1,15 @@
-####################
-#
# build_tools.nsi - sub-installer script for the pololu GNU build utils
# designed to be run from within a larger installer
-#
-####################
-# This installer expects to be passed the variable "STARTDIR" at the command line
-# The directory you point the installer at should directly contain the executables
-# E.g. "makensis /DSTARTDIR=c:\working\wixel-installer\gnu-build-tools c:\working\wixel-installer\build_tools.nsi"
+!define TOOLSVER "120126"
-!define TOOLSVER "110415"
-!include EnvVarUpdate.nsh
+!define STARTDIR ".\build\pololu_gnu_build_utils_${TOOLSVER}"
+OutFile ".\build\pololu_gnu_build_utils_${TOOLSVER}.exe"
-; !define STARTDIR "c:\foo\bar"
+!include EnvVarUpdate.nsh
SetCompressor /solid lzma
RequestExecutionLevel admin
-OutFile "..\..\pololu_gnu_build_tools.exe"
InstallDir "$PROGRAMFILES\Pololu\GNU Build Utilities\"
Name "Pololu GNU Build Utilities"
ShowInstDetails show
@@ -44,10 +37,10 @@ Section "Uninstall"
Delete "$INSTDIR\cp.exe"
Delete "$INSTDIR\echo.exe"
Delete "$INSTDIR\grep.exe"
- Delete "$INSTDIR\license.txt"
+ Delete "$INSTDIR\LICENSE.txt"
Delete "$INSTDIR\make.exe"
Delete "$INSTDIR\mv.exe"
- Delete "$INSTDIR\readme.txt"
+ Delete "$INSTDIR\README.txt"
Delete "$INSTDIR\rm.exe"
Delete "$INSTDIR\sed.exe"
Delete "$INSTDIR\Uninstall Pololu GNU Build Utilities.exe"
View
@@ -0,0 +1,11 @@
+:: prepare_wixel_sdk_for_bundle.bat clones the Wixel SDK,
+:: and builds the docs so it can be put in to the Wixel
+:: Development Bundle.
+
+cd %~dp0/build
+call git clone -o pololu git://github.com/pololu/wixel-sdk.git
+cd wixel-sdk
+call git config core.autocrlf true
+pause
+make docs
+cd ..
@@ -1,11 +1,12 @@
-####################
-#
# wixel_tools_mui.nsi - installer script for the wixel development bundle
-#
-####################
-# This installer expects to be passed the variable "STARTDIR" at the command line
-# E.g. "makensis /DSTARTDIR=c:\working\wixel-installer c:\working\wixel-installer\wixel_tools_mui.nsi"
+!define WIXELTOOLVERSION "120126"
+!define SDCCVER "3.1.0"
+!define NPVER "5.9.8"
+!define UTILS_VER "120126"
+
+!define STARTDIR ".\build"
+OutFile ".\build\wixel_dev_bundle_${WIXELTOOLVERSION}.exe"
# TODO: improve the user experience in the case where they choose to not install the Wixel SDK
@@ -18,9 +19,6 @@ SetCompressor /solid lzma
RequestExecutionLevel admin
; !define STARTDIR=c:\foo\bar
-!define WIXELTOOLVERSION "110415"
-!define SDCCVER "3.0.0"
-!define NPVER "5.9"
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP "${STARTDIR}\wixel-sdk\installer\wixel_fullname_sm.bmp"
!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
@@ -43,7 +41,6 @@ RequestExecutionLevel admin
!insertmacro MUI_UNPAGE_INSTFILES
!insertmacro MUI_UNPAGE_FINISH
-OutFile "..\..\wixel_dev_bundle_${WIXELTOOLVERSION}.exe"
InstallDir "C:\wixel-sdk"
Name "The Pololu Wixel Development Bundle"
!insertmacro MUI_LANGUAGE "English"
@@ -90,10 +87,10 @@ SectionEnd
Section "Pololu GNU Build Utilities" Section3
SetOutPath "$TEMP"
- File "${STARTDIR}\Pololu_GNU_build_tools.exe"
+ File "${STARTDIR}\pololu_gnu_build_utils_${UTILS_VER}.exe"
DetailPrint "Now running the Pololu GNU Build Utilities installer"
MessageBox MB_OK "The Wixel Dev Bundle will now launch the installer for the Pololu GNU Build Utilities"
- ExecWait "$TEMP\Pololu_GNU_build_tools.exe"
+ ExecWait "$TEMP\pololu_gnu_build_tools_${UTILS_VER}.exe"
SectionEnd
Section "Notepad++ Text Editor" Section4
@@ -137,4 +134,4 @@ FunctionEnd
; Function .oninit
-; FunctionEnd
+; FunctionEnd

0 comments on commit b233917

Please sign in to comment.