Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Made changes to enable compilation. #716

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Made changes to enable compilation. #716

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a4899
Made changes to enable compilation.
mikeschinkel Dec 29, 2021
9f27bf9
Merge to resolve conflict
mikeschinkel May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions GOTIDY
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DELETE ME to stop build.bat fron running `go mod tidy`.
21 changes: 17 additions & 4 deletions build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ SET GOBIN=%CD%\bin
REM Support for older architectures
SET GOARCH=386

REM First check to see if they have signtool.
if not exist buildtools\signtool.exe (
echo ----------------------------
echo You need buildtools\signtool.exe to build nvm for Windows.
echo You can get as part of the Windows SDK here:
echo https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
echo ----------------------------
echo "Exiting without building."
)

REM Cleanup existing build if it exists
if exist src\nvm.exe (
del src\nvm.exe
Expand All @@ -16,10 +26,10 @@ echo ----------------------------
echo Building nvm.exe
echo ----------------------------
cd .\src
go build nvm.go

REM Group the file with the helper binaries
move nvm.exe %GOBIN%
if exist ..\GOTIDY (
go mod tidy
)
go build -o %GOBIN%\nvm.exe nvm.go
cd ..\

REM Codesign the executable
Expand Down Expand Up @@ -53,6 +63,9 @@ echo ----------------------------
echo Generating update utility...
echo ----------------------------
cd .\updater
if exist ..\GOTIDY (
go mod tidy
)
go build nvm-update.go
move nvm-update.exe %DIST%
cd ..\
Expand Down
11 changes: 9 additions & 2 deletions nvm.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@
; NOTE: The value of AppId uniquely identifies this application.
; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
PrivilegesRequired=admin
<<<<<<< Updated upstream

; TODO Determine how to stop InnoSetup throwing an error here
; See https://stackoverflow.com/a/44575671/102699
PrivilegesRequired=admin

; SignTool=MsSign $f
; SignedUninstaller=yes
AppId=40078385-F676-4C61-9A9C-F9028599D6D3
Expand All @@ -23,6 +28,7 @@ AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
AppCopyright=Copyright (C) 2018-2021 Ecor Ventures LLC, Corey Butler, and contributors.
DefaultDirName={userappdata}\{#MyAppShortName}
DisableDirPage=no
DefaultGroupName={#MyAppName}
Expand All @@ -37,7 +43,8 @@ ChangesEnvironment=yes
DisableProgramGroupPage=yes
ArchitecturesInstallIn64BitMode=x64 ia64
UninstallDisplayIcon={app}\{#MyIcon}
AppCopyright=Copyright (C) 2018-2021 Ecor Ventures LLC, Corey Butler, and contributors.
VersionInfoTextVersion={%AppVerName}
VersionInfoProductTextVersion={%VersionInfoProductTextVersion}

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
Expand Down
8 changes: 3 additions & 5 deletions src/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ module nvm

go 1.16

replace github.com/coreybutler/go-fsutil => C:\Users\corey\OneDrive\Documents\workspace\oss\coreybutler\go-fsutil

require (
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/coreybutler/go-fsutil v1.1.1 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/blang/semver v3.5.1+incompatible
github.com/coreybutler/go-fsutil v1.2.0
github.com/olekukonko/tablewriter v0.0.5
)
9 changes: 3 additions & 6 deletions src/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/coreybutler/go-fsutil v1.0.8 h1:sSfBictUFuzqBKOKFkzjTeovRexY8alnBUcqgmq1ZgU=
github.com/coreybutler/go-fsutil v1.0.8/go.mod h1:B+6ufEkkRZgFwyR2sHEVG9dMzVBU3GbyGyYmCq7YkEk=
github.com/coreybutler/go-fsutil v1.1.0 h1:HSp9qewM4XspmJJDi4p/QxSSVQTAhn2AlqJxQdmkYE4=
github.com/coreybutler/go-fsutil v1.1.0/go.mod h1:B+6ufEkkRZgFwyR2sHEVG9dMzVBU3GbyGyYmCq7YkEk=
github.com/coreybutler/go-fsutil v1.1.1 h1:ec295Tjnk/BEP/TdiyoaYhtg5/8qcM+BfVyhpjr/6ts=
github.com/coreybutler/go-fsutil v1.1.1/go.mod h1:B+6ufEkkRZgFwyR2sHEVG9dMzVBU3GbyGyYmCq7YkEk=
github.com/coreybutler/go-fsutil v1.2.0 h1:kbm62NSofawglUppEOhpHC3NDf/J7ZpguBirBnsgUwU=
github.com/coreybutler/go-fsutil v1.2.0/go.mod h1:B+6ufEkkRZgFwyR2sHEVG9dMzVBU3GbyGyYmCq7YkEk=
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
Expand All @@ -19,6 +15,7 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
Expand Down
7 changes: 4 additions & 3 deletions updater/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ module nvm
go 1.16

require (
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/coreybutler/go-fsutil v1.1.1 // indirect
github.com/gen2brain/dlgs v0.0.0-20210911090025-cbd38e821b98 // indirect
github.com/blang/semver v3.5.1+incompatible
github.com/coreybutler/go-fsutil v1.1.1
github.com/gen2brain/dlgs v0.0.0-20210911090025-cbd38e821b98
github.com/gopherjs/gopherjs v0.0.0-20210901121439-eee08aaf2717 // indirect
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57
)
1 change: 1 addition & 0 deletions updater/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 h1:F5Gozwx4I1xtr/sr/8CFbb57iKi3297KFs0QDbGN60A=
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down