Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
5bddf79d
Commit
5bddf79d
authored
Apr 21, 2015
by
Torkel Odegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly determine arch for windows builds
parent
05bed2fd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
Gruntfile.js
+4
-2
No files found.
Gruntfile.js
View file @
5bddf79d
/* jshint node:true */
/* jshint node:true */
'use strict'
;
'use strict'
;
module
.
exports
=
function
(
grunt
)
{
module
.
exports
=
function
(
grunt
)
{
var
os
=
require
(
'os'
);
var
os
=
require
(
'os'
);
var
config
=
{
var
config
=
{
pkg
:
grunt
.
file
.
readJSON
(
'package.json'
),
pkg
:
grunt
.
file
.
readJSON
(
'package.json'
),
...
@@ -13,6 +12,10 @@ module.exports = function (grunt) {
...
@@ -13,6 +12,10 @@ module.exports = function (grunt) {
platform
:
process
.
platform
.
replace
(
'win32'
,
'windows'
),
platform
:
process
.
platform
.
replace
(
'win32'
,
'windows'
),
};
};
if
(
process
.
platform
.
match
(
/^win/
))
{
config
.
arch
=
process
.
env
.
hasOwnProperty
(
'ProgramFiles(x86)'
)
?
'x64'
:
'x86'
;
}
config
.
pkg
.
version
=
grunt
.
option
(
'pkgVer'
)
||
config
.
pkg
.
version
;
config
.
pkg
.
version
=
grunt
.
option
(
'pkgVer'
)
||
config
.
pkg
.
version
;
// load plugins
// load plugins
...
@@ -35,7 +38,6 @@ module.exports = function (grunt) {
...
@@ -35,7 +38,6 @@ module.exports = function (grunt) {
// Merge that object with what with whatever we have here
// Merge that object with what with whatever we have here
loadConfig
(
config
,
'./tasks/options/'
);
loadConfig
(
config
,
'./tasks/options/'
);
// pass the config to grunt
// pass the config to grunt
grunt
.
initConfig
(
config
);
grunt
.
initConfig
(
config
);
};
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment