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
30cb28df
Unverified
Commit
30cb28df
authored
Oct 25, 2018
by
Leonard Gram
Committed by
GitHub
Oct 25, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: correctly adds enterprise to the filename. (#13831)
parent
d505d83e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
Gruntfile.js
+5
-0
build.go
+4
-0
scripts/build/build-all.sh
+1
-1
scripts/grunt/options/compress.js
+2
-2
No files found.
Gruntfile.js
View file @
30cb28df
...
...
@@ -9,12 +9,17 @@ module.exports = function (grunt) {
destDir
:
'dist'
,
tempDir
:
'tmp'
,
platform
:
process
.
platform
.
replace
(
'win32'
,
'windows'
),
enterprise
:
false
,
};
if
(
grunt
.
option
(
'platform'
))
{
config
.
platform
=
grunt
.
option
(
'platform'
);
}
if
(
grunt
.
option
(
'enterprise'
))
{
config
.
enterprise
=
true
;
}
if
(
grunt
.
option
(
'arch'
))
{
config
.
arch
=
grunt
.
option
(
'arch'
);
}
else
{
...
...
build.go
View file @
30cb28df
...
...
@@ -403,6 +403,10 @@ func gruntBuildArg(task string) []string {
if
phjsToRelease
!=
""
{
args
=
append
(
args
,
fmt
.
Sprintf
(
"--phjsToRelease=%v"
,
phjsToRelease
))
}
if
enterprise
{
args
=
append
(
args
,
"--enterprise"
)
}
args
=
append
(
args
,
fmt
.
Sprintf
(
"--platform=%v"
,
goos
))
return
args
...
...
scripts/build/build-all.sh
View file @
30cb28df
...
...
@@ -76,7 +76,7 @@ if [ -d '/tmp/phantomjs/windows' ]; then
cp /tmp/phantomjs/windows/phantomjs.exe tools/phantomjs/phantomjs.exe
rm tools/phantomjs/phantomjs
else
echo
'PhantomJS binaries for
darwin
missing!'
echo
'PhantomJS binaries for
Windows
missing!'
fi
go run build.go
-goos
windows
-pkg-arch
amd64
${
OPT
}
package-only
scripts/grunt/options/compress.js
View file @
30cb28df
...
...
@@ -4,7 +4,7 @@ module.exports = function(config) {
var
task
=
{
release
:
{
options
:
{
archive
:
'<%= destDir %>/<%= pkg.name %>-<%= pkg.version %>.<%= platform %>-<%= arch %>.tar.gz'
archive
:
'<%= destDir %>/<%= pkg.name %>
<%= enterprise ? "-enterprise" : "" %>
-<%= pkg.version %>.<%= platform %>-<%= arch %>.tar.gz'
},
files
:
[
{
...
...
@@ -23,7 +23,7 @@ module.exports = function(config) {
};
if
(
config
.
platform
===
'windows'
)
{
task
.
release
.
options
.
archive
=
'<%= destDir %>/<%= pkg.name %>-<%= pkg.version %>.<%= platform %>-<%= arch %>.zip'
;
task
.
release
.
options
.
archive
=
'<%= destDir %>/<%= pkg.name %>
<%= enterprise ? "-enterprise" : "" %>
-<%= pkg.version %>.<%= platform %>-<%= arch %>.zip'
;
}
return
task
;
...
...
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