Merge branch 'beta'

This commit is contained in:
Max Brunsfeld 2015-09-25 13:20:35 -07:00
commit ee8f436490
2 changed files with 7 additions and 2 deletions

View File

@ -22,7 +22,7 @@
"grunt-contrib-less": "~0.8.0",
"grunt-cson": "0.16.0",
"grunt-download-electron": "^2.1.1",
"grunt-electron-installer": "1.0.3-0",
"grunt-electron-installer": "1.0.3-3",
"grunt-lesslint": "0.17.0",
"grunt-peg": "~1.1.0",
"grunt-shell": "~0.3.1",

View File

@ -77,7 +77,12 @@ getAssets = ->
]
when 'win32'
assets = [{assetName: 'atom-windows.zip', sourcePath: 'Atom'}]
for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"]
# NuGet packages can't have dots in their pre-release name, so we remove
# those dots in `grunt-electron-installer` when generating the package.
nupkgVersion = version.replace(/\.(\d+)$/, '$1')
for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{nupkgVersion}-full.nupkg", "atom-#{nupkgVersion}-delta.nupkg"]
cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset)
assets.push({assetName: squirrelAsset, sourcePath: assetName})
assets