-
Notifications
You must be signed in to change notification settings - Fork 21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Grand master split #6
Open
VoR0220
wants to merge
20
commits into
qtumproject:proto-x86
Choose a base branch
from
VoR0220:grandMasterSplit
base: proto-x86
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
d280e13
Update helpers for cleaned up docker
Earlz bd09c74
added new simpleABI into the fold
VoR0220 4701c10
Merge pull request #5 from VoR0220/addSimpleABI
pandazwb 74c5560
docker client smooshed to 40mb and separated from toolchain, needs on…
VoR0220 0d651b1
split client from main dockerfile
VoR0220 2061870
split toolchain from main dockerfile
VoR0220 97d11a7
set up testing for this to work with the original tutorial
VoR0220 f896b24
fixups
VoR0220 7e42893
adjust helpers.sh and edit dockerfile
VoR0220 4449ffe
pushing up the qbit file and some debugging bits
VoR0220 3b74253
change makefile to use qx86codeify and delete unnecessary bash scripts
VoR0220 cbc0120
should not be in the git repo
VoR0220 000775d
add simpleabi, modify helpers, add installation script, take boost ou…
VoR0220 04aa9f2
take out gdb and debug symbols
VoR0220 0fcea8f
add install.sh
VoR0220 4343d22
remove redundancies from old build
VoR0220 ff2445e
add sanity checks to client build
VoR0220 525fd10
fix of install script
VoR0220 ea7d0ac
ensure output goes through
VoR0220 c4a1311
fix simple abi portion
VoR0220 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
FROM qtum-alpine-bin as build | ||
LABEL maintainers "earlz, VoR0220" | ||
|
||
FROM alpine | ||
|
||
# | ||
# Copy the binaries from the build to our new container | ||
# | ||
COPY --from=build /usr/local/bin/qtumd /usr/local/bin | ||
COPY --from=build /usr/local/bin/qtum-cli /usr/local/bin | ||
# | ||
# Install all dependencies | ||
# | ||
RUN apk update && apk add boost boost-filesystem \ | ||
boost-program_options \ | ||
boost-system boost-thread \ | ||
boost-random busybox db-c++ \ | ||
libevent libgcc libressl2.7-libcrypto \ | ||
libstdc++ musl | ||
|
||
# | ||
# Copy the qtum.conf file from | ||
# the build context into the container | ||
# | ||
COPY qtum.conf /qtum.conf | ||
|
||
# create data directory | ||
ENV QTUM_DATA /data | ||
RUN mkdir $QTUM_DATA \ | ||
&& ln -sfn $QTUM_DATA /.qtum | ||
VOLUME /data | ||
|
||
EXPOSE 3888 3889 13888 13889 | ||
ENV PATH=${PATH}:/usr/local/bin: | ||
CMD ["qtumd", "-regtest", "-logevents", "-printtoconsole"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
FROM alpine-dev | ||
RUN set -ex && git clone https://github.com/qtumproject/qtum-x86.git --recursive && cd qtum-x86 && git checkout qtum-x86 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
FROM alpine:3.9.4 | ||
LABEL maintainers "earlz, VoR0220" | ||
|
||
RUN apk update && apk add git \ | ||
make \ | ||
cmake \ | ||
file \ | ||
autoconf \ | ||
automake \ | ||
build-base \ | ||
libtool \ | ||
db-c++ \ | ||
db-dev \ | ||
boost-system \ | ||
boost-program_options \ | ||
boost-filesystem \ | ||
boost-dev \ | ||
libressl-dev \ | ||
libevent-dev |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
FROM qtum-alpine-build | ||
RUN (cd qtum-x86 && ./autogen.sh && \ | ||
./configure \ | ||
--disable-bench --disable-static \ | ||
--without-gui --disable-zmq \ | ||
--with-incompatible-bdb \ | ||
CFLAGS='-w' CXXFLAGS='-w' && \ | ||
make -j 4 && \ | ||
strip src/qtumd && \ | ||
strip src/qtum-cli && \ | ||
strip src/qtum-tx && \ | ||
make install && make check && make clean && make distclean) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
docker build -f Dockerfile.dev -t alpine-dev . | ||
docker build -f Dockerfile.build -t qtum-alpine-build . | ||
docker build --no-cache -f Dockerfile.install -t qtum-alpine-bin . | ||
docker build -f Dockerfile -t qtum-alpine . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
regtest=1 | ||
server=1 | ||
rpcbind=127.0.0.1:3888 | ||
rpcuser=user | ||
rpcpassword=password | ||
rpcallowip=0.0.0.0/0 | ||
rpcport=3888 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#!/bin/bash | ||
cd client | ||
./build.sh | ||
cd ../toolchain | ||
./build.sh | ||
cd ../simpleabi | ||
docker build -t qtum-simpleabi . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
FROM golang:1.7.3 | ||
|
||
RUN go get -u -v -d github.com/qtumproject/simple-abi && \ | ||
cd /go/src/github.com/qtumproject/simple-abi && \ | ||
CGO_ENABLED=0 GOOS=linux go build -o simple-abi . | ||
|
||
FROM alpine:3.9.4 | ||
LABEL maintainers "earlz, VoR0220" | ||
|
||
COPY --from=0 /go/src/github.com/qtumproject/simple-abi/simple-abi /usr/local/bin | ||
ENTRYPOINT [ "simple-abi" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# files to be built | ||
# fill this in as a template | ||
HDRS = | ||
C_SRC = helloworld.c | ||
OUTPUT = helloworld.elf | ||
LIBS = | ||
BYTECODE = helloworld.qbit | ||
|
||
C_OBJS = $(subst .c,.o,$(C_SRC)) | ||
|
||
#these default flags will just remove dead code and give warnings | ||
CFLAGS += -Wall -ffunction-sections -fdata-sections | ||
LDFLAGS += -Wl,--gc-section | ||
|
||
|
||
default: $(BYTECODE) | ||
|
||
$(BYTECODE): $(OUTPUT) | ||
qx86-codeify -elf $(OUTPUT) -hex -o $(BYTECODE) | ||
|
||
$(OUTPUT): $(C_OBJS) | ||
$(CC) $(LDFLAGS) -o $(OUTPUT) $(C_OBJS) $(LIBS) | ||
|
||
$(C_OBJS): $(HDRS) $(C_SRC) | ||
$(CC) $(CFLAGS) -c $*.c -o $@ | ||
|
||
clean: | ||
rm -f $(C_OBJS) $(OUTPUT) $(BYTECODE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#include <qtum.h> | ||
|
||
int onCreate() | ||
{ | ||
qtumEventStringString("Hello World", "Contract creation"); | ||
return 0; | ||
} | ||
|
||
int main() | ||
{ | ||
qtumEventStringString("Hello World", "Execution Success!"); | ||
return 0; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The ""$@"" is needed so that
qx86make clean
for example worksThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@VoR0220 Hi, once this is resolved, I am able to merge the PR.