Added Batch that sets environment accordingly.

Author: hernandp

installer/src/AlgorandNode.wxs

@@ -207,8 +207,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
                     <Component Id="AlgorandShortcuts" Guid="*">
                         <Shortcut Id="CommandLineTools" Name="Algorand Command Line Tools" 
                             Target="[System64Folder]cmd.exe"
-                            Arguments="/k cd /d &quot;[netspecificdir]&quot;"
-                            WorkingDirectory="netspecificdir"
+                            Arguments="/k &quot;[netspecificdir]\System\setenv.cmd&quot; /walkback"
+                            WorkingDirectory="systemDir"
                             Show="normal"/>
 
                         <Shortcut Id="NodeStatusWatch" Name="Node Status Watch" 
@@ -257,6 +257,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
                             </RegistryKey>
                         </Component>
 
+                        <Component Id='SetEnvBatch' Guid='*'>
+                            <File Id="setenv" Name="setenv.cmd" DiskId="1" Source="$(var.BATCHFOLDER)/setenv.cmd" KeyPath="yes" />
+                        </Component>
+
                         </Directory>
 
                     <Component Id='BINCOMP_algocfg' Guid='*'>
@@ -425,6 +429,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
             <ComponentRef Id='genesisfile' />
             <ComponentRef Id='configfile' />
             <ComponentRef Id='AlgorandNodeService'/>
+            <ComponentRef Id='SetEnvBatch'/>
             <ComponentRef Id='BINCOMP_algocfg' />
             <ComponentRef Id='BINCOMP_algod'/>
             <ComponentRef Id='BINCOMP_algoh'/>

installer/src/Makefile

@@ -33,6 +33,7 @@ CANDLE=$(WIX)bin/candle.exe
 LIGHT=$(WIX)bin/light.exe
 GOBINFOLDER=$(HOME)/go/bin
 SVCBINFOLDER=../../algodsvc
+BATCHFOLDER=./batch
 ALGOVERSION := $(shell $(GOBINFOLDER)/goal.exe --version | awk 'FNR == 2 { print $$1 }' | awk -F "." 'BEGIN{OFS=""} { print $$1,".",$$2,".",$$3 }')
 MSI=$(MSIDIR)AlgorandNode-$(SUFFIX)_amd64.msi
 THISPRODUCTID := $(shell echo -n $(SUFFIX) | sha256sum | cut -c 1-32 | sed 's/./&-/8;s/./&-/13;s/./&-/18;s/./&-/23')
@@ -46,7 +47,7 @@ $(CADLL): $(CASOURCE) $(PCHOUT)
 	$(CC) $(CASOURCE) -include $(PCHSOURCE) -o $(CADLL) $(CFLAGS)
 
 $(OBJ): $(SOURCES) $(CADLL)
-	"$(CANDLE)" $(SOURCES) -ext WixUtilExtension -out "$(OBJDIR)" -arch x64 -dTHISPRODUCTID=$(THISPRODUCTID) -dALGOVERSION=$(ALGOVERSION) -dGOBINFOLDER=$(GOBINFOLDER) -dSVCBINFOLDER=$(SVCBINFOLDER) -dNETWORK=$(NETWORK) -v
+	"$(CANDLE)" $(SOURCES) -ext WixUtilExtension -out "$(OBJDIR)" -arch x64 -dTHISPRODUCTID=$(THISPRODUCTID) -dALGOVERSION=$(ALGOVERSION) -dGOBINFOLDER=$(GOBINFOLDER) -dSVCBINFOLDER=$(SVCBINFOLDER) -dBATCHFOLDER=$(BATCHFOLDER) -dNETWORK=$(NETWORK) -v
 
 $(MSI): $(OBJ)
 	"$(LIGHT)" $(OBJDIR)*.wixobj  -ext WixUtilExtension -ext WixUIExtension -out $(MSI) -reusecab -cc cabs -v

installer/src/batch/setenv.cmd

@@ -0,0 +1,18 @@
+@echo off
+echo Algorand Command-line Tools for Windows Environment Setup
+echo.
+
+pushd ..
+for %%* in (.) do set ALGORAND_NETWORK=%%~nx*
+set ALGORAND_TOOLS=%cd%
+popd
+
+set ALGORAND_DATA=%PROGRAMDATA%\Algorand\data\%ALGORAND_NETWORK%
+set PATH=%PATH%;%ALGORAND_TOOLS%
+
+echo * Set ALGORAND_DATA=%ALGORAND_DATA%
+echo * Added "%ALGORAND_TOOLS%" to this session PATH.
+
+echo Done.
+
+if "%1" == "/walkback" cd..