Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
32d52ec2
Commit
32d52ec2
authored
8 years ago
by
Oz Linden
Browse files
Options
Downloads
Patches
Plain Diff
display build metadata, remove obsolete private.html
parent
bd2005e0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
build.sh
+7
-10
7 additions, 10 deletions
build.sh
with
7 additions
and
10 deletions
build.sh
+
7
−
10
View file @
32d52ec2
...
@@ -141,9 +141,12 @@ build()
...
@@ -141,9 +141,12 @@ build()
local
variant
=
"
$1
"
local
variant
=
"
$1
"
if
$build_viewer
if
$build_viewer
then
then
begin_section
"autobuild
$variant
"
"
$autobuild
"
build
--no-configure
-c
$variant
||
fatal
"failed building
$variant
"
"
$autobuild
"
build
--no-configure
-c
$variant
||
fatal
"failed building
$variant
"
echo true
>
"
$build_dir
"
/build_ok
echo true
>
"
$build_dir
"
/build_ok
end_section
"autobuild
$variant
"
begin_section
"extensions
$variant
"
# Run build extensions
# Run build extensions
if
[
-d
${
build_dir
}
/packages/build-extensions
]
if
[
-d
${
build_dir
}
/packages/build-extensions
]
then
then
...
@@ -157,6 +160,7 @@ build()
...
@@ -157,6 +160,7 @@ build()
# *TODO: Make this a build extension.
# *TODO: Make this a build extension.
package_llphysicsextensions_tpv
||
fatal
"failed building llphysicsextensions packages"
package_llphysicsextensions_tpv
||
fatal
"failed building llphysicsextensions packages"
end_section
"extensions
$variant
"
else
else
record_event
"Skipping build due to configuration build_viewer=
${
build_viewer
}
"
record_event
"Skipping build due to configuration build_viewer=
${
build_viewer
}
"
...
@@ -273,7 +277,7 @@ do
...
@@ -273,7 +277,7 @@ do
else
else
record_failure
"Build of
\"
$variant
\"
failed."
record_failure
"Build of
\"
$variant
\"
failed."
fi
fi
begin
_section
"post-build
$variant
"
end
_section
"post-build
$variant
"
else
else
record_event
"configure for
$variant
failed: build skipped"
record_event
"configure for
$variant
failed: build skipped"
...
@@ -340,13 +344,6 @@ then
...
@@ -340,13 +344,6 @@ then
mv
$build_log_dir
/
$debian_repo_type
$build_log_dir
/
${
debian_repo_type
}
_pushed
mv
$build_log_dir
/
$debian_repo_type
$build_log_dir
/
${
debian_repo_type
}
_pushed
fi
fi
done
done
if
[
$have_private_repo
=
true
]
;
then
python_cmd
"
$helpers
/redirect.py"
"
${
private_S3PROXY_URL
}${
S3PREFIX
}
repo/
$repo
/rev/
$revision
/index.html"
\
>
"
$build_log_dir
/private.html"
||
fatal
"generating global redirect"
upload_output global_redirect
"
$build_log_dir
/private.html"
text/html private
fi
end_section
"Upload Debian Repository"
end_section
"Upload Debian Repository"
else
else
...
@@ -373,7 +370,7 @@ then
...
@@ -373,7 +370,7 @@ then
# Upload base package.
# Upload base package.
upload_output installer
"
$package
"
binary/octet-stream
upload_output installer
"
$package
"
binary/octet-stream
[
-f
$build_dir
/summary.json
]
&&
upload_output
"installer metadata"
$build_dir
/summary.json application/json
[
-f
$build_dir
/summary.json
]
&&
upload_output
"installer metadata"
$build_dir
/summary.json application/json
display
# Upload additional packages.
# Upload additional packages.
for
package_id
in
$additional_packages
for
package_id
in
$additional_packages
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment