Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
duniter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nodes
typescript
duniter
Commits
831b1f03
Commit
831b1f03
authored
8 years ago
by
Cédric Moreau
Browse files
Options
Downloads
Patches
Plain Diff
[fix] Correct build through VMs
parent
35c64682
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
release/arch/debian/Vagrantfile
+1
-1
1 addition, 1 deletion
release/arch/debian/Vagrantfile
release/arch/debian/bootstrap.sh
+1
-1
1 addition, 1 deletion
release/arch/debian/bootstrap.sh
release/arch/debian/build-deb.sh
+7
-1
7 additions, 1 deletion
release/arch/debian/build-deb.sh
with
9 additions
and
3 deletions
release/arch/debian/Vagrantfile
+
1
−
1
View file @
831b1f03
...
@@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|
...
@@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|
# Every Vagrant development environment requires a box. You can search for
# Every Vagrant development environment requires a box. You can search for
# boxes at https://atlas.hashicorp.com/search.
# boxes at https://atlas.hashicorp.com/search.
config
.
vm
.
box
=
"https://s3.eu-central-1.amazonaws.com/duniter/vagrant/duniter_
ubuntu
.box"
config
.
vm
.
box
=
"https://s3.eu-central-1.amazonaws.com/duniter/vagrant/duniter_
trusty64
.box"
config
.
vm
.
provision
:shell
,
path:
"bootstrap.sh"
config
.
vm
.
provision
:shell
,
path:
"bootstrap.sh"
# Disable automatic box update checking. If you disable this, then
# Disable automatic box update checking. If you disable this, then
...
...
This diff is collapsed.
Click to expand it.
release/arch/debian/bootstrap.sh
+
1
−
1
View file @
831b1f03
...
@@ -9,4 +9,4 @@ apt-get update
...
@@ -9,4 +9,4 @@ apt-get update
apt-get
install
--yes
git curl build-essential yarn python-minimal zip
apt-get
install
--yes
git curl build-essential yarn python-minimal zip
# User installation
# User installation
sudo
su
ubu
nt
u
-c
"bash /vagrant/user-bootstrap.sh"
sudo
su
vagra
nt
-c
"bash /vagrant/user-bootstrap.sh"
This diff is collapsed.
Click to expand it.
release/arch/debian/build-deb.sh
+
7
−
1
View file @
831b1f03
...
@@ -126,10 +126,16 @@ cd "$RELEASES/desktop_/node_modules/sqlite3"
...
@@ -126,10 +126,16 @@ cd "$RELEASES/desktop_/node_modules/sqlite3"
node-pre-gyp
--runtime
=
node-webkit
--target
=
$NW_VERSION
configure
node-pre-gyp
--runtime
=
node-webkit
--target
=
$NW_VERSION
configure
node-pre-gyp
--runtime
=
node-webkit
--target
=
$NW_VERSION
build
node-pre-gyp
--runtime
=
node-webkit
--target
=
$NW_VERSION
build
cp
lib/binding/node-webkit-
$NW_RELEASE
-linux-x64
/node_sqlite3.node lib/binding/node-v
$ADDON_VERSION
-linux-x64
/node_sqlite3.node
cp
lib/binding/node-webkit-
$NW_RELEASE
-linux-x64
/node_sqlite3.node lib/binding/node-v
$ADDON_VERSION
-linux-x64
/node_sqlite3.node
cd
"
$RELEASES
/desktop_/node_modules/heapdump"
nw-gyp
--target
=
$NW_VERSION
configure
nw-gyp
--target
=
$NW_VERSION
build
# Unused binaries
# Unused binaries
cd
"
$RELEASES
/desktop_/"
cd
"
$RELEASES
/desktop_/"
rm
-rf
node_modules/sqlite3/build
rm
-rf
node_modules/sqlite3/build
#rm -rf node_modules/naclb/build
#rm -rf node_modules/wotb/build
#rm -rf node_modules/scryptb/build
## Install Nw.js
## Install Nw.js
mkdir
-p
"
$RELEASES
/desktop_release"
mkdir
-p
"
$RELEASES
/desktop_release"
...
@@ -155,7 +161,7 @@ tar czf /vagrant/duniter-desktop-${DUNITER_TAG}-linux-x64.tar.gz * --exclude ".g
...
@@ -155,7 +161,7 @@ tar czf /vagrant/duniter-desktop-${DUNITER_TAG}-linux-x64.tar.gz * --exclude ".g
# -------------------------------------------------
# -------------------------------------------------
# Create .deb tree + package it
# Create .deb tree + package it
cp
-r
"
$RELEASES
/desktop_release/sources/
ci/travis/debian
"
"
$RELEASES
/duniter-x64"
cp
-r
"
$RELEASES
/desktop_release/sources/
release/arch/debian/package
"
"
$RELEASES
/duniter-x64"
mkdir
-p
"
$RELEASES
/duniter-x64/opt/duniter/"
mkdir
-p
"
$RELEASES
/duniter-x64/opt/duniter/"
chmod
755
${
RELEASES
}
/duniter-x64/DEBIAN/post
*
chmod
755
${
RELEASES
}
/duniter-x64/DEBIAN/post
*
chmod
755
${
RELEASES
}
/duniter-x64/DEBIAN/pre
*
chmod
755
${
RELEASES
}
/duniter-x64/DEBIAN/pre
*
...
...
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