good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
2d274003
Commit
2d274003
authored
Jun 26, 2014
by
Jeffrey Wilcke
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop'
Conflicts: install.sh
parents
bf2ac5ac
52ddf044
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ethereal/main.go
+3
-2
3 additions, 2 deletions
ethereal/main.go
install.sh
+8
-3
8 additions, 3 deletions
install.sh
with
11 additions
and
5 deletions
ethereal/main.go
+
3
−
2
View file @
2d274003
...
@@ -10,10 +10,11 @@ import (
...
@@ -10,10 +10,11 @@ import (
)
)
func
main
()
{
func
main
()
{
runtime
.
GOMAXPROCS
(
runtime
.
NumCPU
())
// Leave QT on top at ALL times.
qml
.
Init
(
nil
)
qml
.
Init
(
nil
)
runtime
.
GOMAXPROCS
(
runtime
.
NumCPU
())
var
interrupted
=
false
var
interrupted
=
false
utils
.
RegisterInterrupt
(
func
(
os
.
Signal
)
{
utils
.
RegisterInterrupt
(
func
(
os
.
Signal
)
{
interrupted
=
true
interrupted
=
true
...
...
This diff is collapsed.
Click to expand it.
install.sh
+
8
−
3
View file @
2d274003
...
@@ -26,13 +26,18 @@ if [ $? != 0 ]; then
...
@@ -26,13 +26,18 @@ if [ $? != 0 ]; then
exit
exit
fi
fi
echo
"serpent-go"
cd
$GOPATH
/src/github.com/obscuren/mutan
cd
$GOPATH
/src/github.com/obscuren/mutan
echo
"init submodule"
git submodule init
git submodule init
git su
m
bodule update
git sub
m
odule update
echo
"eth-go"
cd
$GOPATH
/src/github.com/ethereum/eth-go
cd
$GOPATH
/src/github.com/ethereum/eth-go
git checkout
$branch
git checkout
$branch
echo
"go-ethereum"
cd
$GOPATH
/src/github.com/ethereum/go-ethereum/
$exe
cd
$GOPATH
/src/github.com/ethereum/go-ethereum/
$exe
git checkout
$branch
git checkout
$branch
...
@@ -40,9 +45,9 @@ if [ "$exe" == "ethereal" ]; then
...
@@ -40,9 +45,9 @@ if [ "$exe" == "ethereal" ]; then
echo
"Building ethereal GUI. Assuming Qt is installed. If this step"
echo
"Building ethereal GUI. Assuming Qt is installed. If this step"
echo
"fails; please refer to: https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)"
echo
"fails; please refer to: https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)"
else
else
echo
"Building ethereum CLI.
echo
"Building ethereum CLI.
"
fi
fi
go
install
go
install
echo "
done
.
..
"
echo
"done.
Please run
$exe
:-)
"
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