v0.1.0 (Ahorn for Julia 1.1)

prepare.py

@@ -8,14 +8,14 @@
 import stat
 from PIL import Image
 
-JULIA_VERSION = (0, 6, 4)
+JULIA_VERSION = (1, 1, 0)
 CHECKSUM_TYPE = "sha256"
 
 JULIA_BIN_FILENAME = "julia-{v[0]}.{v[1]}.{v[2]}-win64.exe".format(v=JULIA_VERSION)
 JULIA_BIN = "https://julialang-s3.julialang.org/bin/winnt/x64/{v[0]}.{v[1]}/{file}".format(v=JULIA_VERSION, file=JULIA_BIN_FILENAME)
 JULIA_CHECKSUMS = "https://julialang-s3.julialang.org/bin/checksums/julia-{v[0]}.{v[1]}.{v[2]}.{checksum}".format(v=JULIA_VERSION, checksum=CHECKSUM_TYPE)
 
-LOGO_FILE = "logo-1024-a.png"
+LOGO_FILE = "logo-1024.png"
 ICON_SIZES = [16, 32, 48, 64, 96, 128, 256]
 
 JULIA_JUNK = [
@@ -285,4 +285,4 @@ def setupAhorn():
     print(makeIco())
     print(setupAhorn())
     print(compileNSISTemplate())
-    print(NSISBuildInstaller())
+    print(NSISBuildInstaller())

setup-ahorn.jl

@@ -1,19 +1,9 @@
+using Pkg
 
-println("""
-======================
-Initializing package repository
-======================
-""")
-Pkg.init()
-
-install_or_update(url::String, pkg::String) = try 
-    if Pkg.installed(pkg) !== nothing
-        println("Updating $pkg...")
-        Pkg.update(pkg)
-    end
-catch err
-    println("Installing $pkg...")
-    Pkg.clone(url, pkg)
+install_or_update(url::String, pkg::String) = begin
+    spec = PackageSpec(name=pkg, url=url)
+    Pkg.add(spec)
+    Pkg.update(spec)
 end
 
 

src/ahorn.bat

@@ -1,5 +1,5 @@
 set AHORN_HOME=%~dp0
 set JULIA_HOME=%AHORN_HOME%julia\bin
-set JULIA_PKGDIR=%AHORN_HOME%juliapkg
+set JULIA_DEPOT_PATH=%AHORN_HOME%juliapkg
 
-"%JULIA_HOME%\julia.exe" "%JULIA_PKGDIR%\v0.6\Ahorn\src\run_ahorn.jl" %*
+"%JULIA_HOME%\julia.exe" -e "using Ahorn; Ahorn.displayMainWindow()"

src/build_ahorn.bat

@@ -1,10 +1,10 @@
 @echo off
 set AHORN_HOME=%~dp0
 set JULIA_HOME=%AHORN_HOME%julia\bin
-set JULIA_PKGDIR=%AHORN_HOME%juliapkg
+set JULIA_DEPOT_PATH=%AHORN_HOME%juliapkg
 
 echo !!! Running Pkg.build...
-"%JULIA_HOME%\julia.exe" -e "Pkg.build()"
+"%JULIA_HOME%\julia.exe" -e "using Pkg; Pkg.build()"
 
 echo !!! Precompiling modules...
-"%JULIA_HOME%\julia.exe" -e "for pkg in collect(keys(Pkg.installed())) if !isdefined(Symbol(pkg)) && pkg != join(`Compat.jl`.exec); info(join(`Importing\ $(pkg)...`.exec)); try (@eval import $(Symbol(pkg))) catch end end end"
+"%JULIA_HOME%\julia.exe" -e "using Pkg; Pkg.API.precompile()"

src/julia.bat

@@ -1,5 +1,5 @@
 set AHORN_HOME=%~dp0
 set JULIA_HOME=%AHORN_HOME%julia\bin
-set JULIA_PKGDIR=%AHORN_HOME%juliapkg
+set JULIA_DEPOT_PATH=%AHORN_HOME%juliapkg
 echo %CD%
-"%JULIA_HOME%\julia.exe" %*
+"%JULIA_HOME%\julia.exe" %*

templates/Ahorn.nsi.j2

@@ -12,8 +12,8 @@
 !define DESCRIPTION "Visual Map Maker and Level Editor for the game Celeste"
 # These three must be integers
 !define VERSIONMAJOR 0
-!define VERSIONMINOR 0
-!define VERSIONBUILD 3
+!define VERSIONMINOR 1
+!define VERSIONBUILD 0
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
 !define HELPURL "https://github.com/CelestialCartographers/Ahorn/issues" # "Support Information" link
@@ -132,4 +132,4 @@ section "uninstall"
 
 	# Remove uninstaller information from the registry
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}"
-sectionEnd
+sectionEnd