Skip to content
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

convert build system to autotools #177

Closed
wants to merge 2 commits into from
Closed

Conversation

jaromil
Copy link
Contributor

@jaromil jaromil commented Apr 21, 2011

adding autotools for build checks, configure flags for compile time
configuration and handling of #define directives inside code and
things that will possibily make it better for bitcoin to be packaged
inside distributions, as well ported to different architectures.

this pull request follows my first sloppy attempt here:
#162
i've followed suggestions given by jgarzik, thanks for your patience

this pull request is a rebase of this branch
https://github.com/jaromil/bitcoin/commits/master
which eliminates all those commits and squashes them in this.

the bitcoind code itself was never modified, just moved around, with
two exceptions:

  1. 9141f2c renamed cryptopp/config.h to settings.h
  2. c929bae code namespace change: (int)VERSION renamed to
    BITCOIN_VERSION in headers.h

so just one filename and one variable name changed, plus one #ifdef
inside headers.h

code modules have been separated in subdirectories and compiled as
static libraries, still using libtool, which is the recommended
behaviour when using autotools.

a flag --enable-upnp=0/1 has been added and configure.ac contains
templates for adding more compile time choices in future.

as libbitcoin will be provided in future, ABI versioning is also ready
to be adopted via libtool.

the test/ directory is imported from gasteve's branch for test units.

Build of this was tested on Debian 6 (also with WX GUI), Apple OSX
10.5 (without WX GUI) and CYGWIN win32 (without dependencies).

adding autotools for build checks, configure flags for compile time
configuration and handling of #define directives inside code and
things that will possibily make it better for bitcoin to be packaged
inside distributions, as well ported to different architectures.

this pull request follows my first sloppy attempt here:
bitcoin#162
i've followed suggestions given by jgarzik, thanks for your patience

this pull request is a rebase of this branch
https://github.com/jaromil/bitcoin/master
which eliminates all those commits and squashes them in this.

the bitcoind code itself was never modified, just moved around, with
two exceptions:

1) 9141f2c renamed cryptopp/config.h to settings.h
2) c929bae code namespace change: (int)VERSION renamed to
   BITCOIN_VERSION in headers.h

so just one filename and one variable name changed, plus one #ifdef
inside headers.h

code modules have been separated in subdirectories and compiled as
static libraries, still using libtool, which is the recommended
behaviour when using autotools.

a flag --enable-upnp=0/1 has been added and configure.ac contains
templates for adding more compile time choices in future.

as libbitcoin will be provided in future, ABI versioning is also ready
to be adopted via libtool.

the test/ directory is imported from gasteve's branch for test units.

Build of this was tested on Debian 6 (also with WX GUI), Apple OSX
10.5 (without WX GUI) and CYGWIN win32 (without dependencies).
@jgarzik
Copy link
Contributor

jgarzik commented Apr 21, 2011

One important practice for git...

When everything is just a single commit, it is difficult to review, to see if the submittor has inserted a tiny bit of malicious code, in all that code movement. I'm not accusing you of this, just speaking generally.

So, this commit should really be two, either (a) convert to autotools then (b) move files around, or (a) move files around under old build system, verify that it builds and works under old build system, then (b) convert to autotools. That enables the reviewers to easily review the "move files around" commit and verify that it truly includes -zero- code changes.

Also, in terms of marketing, I think it is a bit misleading to call it the "GNUification of bitcoin" It might make people think bitcoin is changing its license from MIT to GPL, at first glance.

The more technically accurate description is "convert bitcoin build system to autotools" or similar. If we imported your git commit as-is into bitcoin.git, the one-line summary of your commit is "The aim of this commit is mostly that of GNUification for bitcoin" which does not tell the reader anything.

@jaromil
Copy link
Contributor Author

jaromil commented Apr 21, 2011

sry i forgot to mention: for building run first 'autoreconf -i' and then the usual ./configure (--enable-upnp recommended!)

sure, ok for "convert bitcoin build system to autotools"

re: multiple commits, we have now two branches: the one with the FULL history of my activity in autotools, and this one.

it is no problem for me to adjust things, yet the three steps you are mentioning are fragmented in the full and here squashed. should this be really split in 3 commits then?

autotools generated header is renamed to auto-config.h
as suggested by jgarzik
@jaromil
Copy link
Contributor Author

jaromil commented Apr 21, 2011

i'm rounding up on devs comments, then will break this commit in two parts, following these recommendations:

23:26 jaromil: and each git commit needs to be buildable on its own, in order to keep 'git bisect' working. sometimes that means an intermediate step requires a bit of extra work, unfortunately.
for example, if you do (1) move files, then (2) autotools, then commit #1 must update the old build system to work. then commit #2 undoes that work, switching to autotools.
23:27 jaromil: it helps if you view each git commit like a step in an equation, or proof
23:27 both sides are equal at all times, even though each step represents a transformation

which will be done in another pull request. please leave this open until all issues are rounded up here.

@jaromil
Copy link
Contributor Author

jaromil commented Apr 23, 2011

ok, closing this and re-filing another pull request with two commit steps, as jgarzik suggested:

a) move files around under old build system, verify that it builds and works under old build system
b) convert to autotools

@jaromil jaromil closed this Apr 23, 2011
zathras-crypto pushed a commit to zathras-crypto/omnicore that referenced this pull request Nov 27, 2014
…umber

Add transaction version and type to RPC output
sipa added a commit to sipa/bitcoin that referenced this pull request Jan 5, 2015
50cc6ab Merge pull request bitcoin#178
941e221 Add tests for handling of the nonce function in signing.
10c81ff Merge pull request bitcoin#177
7688e34 Add magnitude limits to secp256k1_fe_verify to ensure that it's own tests function correctly.
4ee4f7a Merge pull request bitcoin#176
70ae0d2 Use secp256k1_fe_equal_var in secp256k1_fe_sqrt_var.
7767b4d Merge pull request bitcoin#175
9ab9335 Add a reference consistency test to ge_tests.
60571c6 Rework group tests
d26e26f Avoid constructing an invalid signature with probability 1:2^256.
b450c34 Merge pull request bitcoin#163
d57cae9 Merge pull request bitcoin#154
49ee0db Add _normalizes_to_zero_var variant
eed599d Add _fe_normalizes_to_zero method
d7174ed Weak normalization for secp256k1_fe_equal
0295f0a weak normalization
bbd5ba7 Use rfc6979 as default nonce generation function
b37fbc2 Implement SHA256 / HMAC-SHA256 / RFC6979.
c6e7f4e [API BREAK] Use a nonce-generation function instead of a nonce
cf0c48b Merge pull request bitcoin#169
603c33b Make signing fail if a too small buffer is passed.
6d16606 Merge pull request bitcoin#168
7277fd7 Remove GMP field implementation
e99c4c4 Merge pull request #123
13278f6 Add explanation about how inversion can be avoided
ce7eb6f Optimize verification: avoid field inverse
a098f78 Merge pull request bitcoin#160
38acd01 Merge pull request bitcoin#165
6a59012 Make git ignore bench_recover when configured with benchmark enabled
1ba4a60 Configure options reorganization
3c0f246 Merge pull request bitcoin#157
808dd9b Merge pull request bitcoin#156
8dc75e9 Merge pull request bitcoin#158
28ade27 build: nuke bashisms
5190079 build: use subdir-objects for automake
8336040 build: disable benchmark by default

git-subtree-dir: src/secp256k1
git-subtree-split: 50cc6ab
dexX7 added a commit to dexX7/bitcoin that referenced this pull request Aug 17, 2015
c67965f Sanitize RPC responses and replace non-UTF-8 compliant characters (dexX7)
8d077ad Support handling of valid and invalid UTF-8 encoded strings (dexX7)
TheBlueMatt added a commit to TheBlueMatt/bitcoin that referenced this pull request Oct 20, 2015
This contains the following two merges, as well as a few other changes:

Squashed 'src/secp256k1/' changes from 22f60a6..18f9f08

18f9f08 Pedersen commitments, borromean ring signatures, and ZK range proofs.
5161227 Add benchmark for ECDH multiplication
c40cb72 Expose API for constant time point multiplication
40adc7a Add constant-time `secp256k1_ecdh_point_multiply` for ECDH
ff9a397 Add zero/one tests to ecmult
729badf Merge pull request bitcoin#210
2d5a186 Apply effective-affine trick to precomp
4f9791a Effective affine addition in EC multiplication

git-subtree-dir: src/secp256k1
git-subtree-split: 18f9f0821c5a7795b760763c99d545af96a22775

Squashed 'src/secp256k1/' changes from b0210a9..22f60a6

22f60a6 Merge pull request bitcoin#245
61c1b1e Merge pull request bitcoin#190
d227579 Add scalar blinding and a secp256k1_context_randomize() call.
c146b4a Add bench_internal to gitignore.
9c4fb23 Add a secp256k1_fe_cmov unit test.
426fa52 Merge pull request bitcoin#243
d505a89 Merge pull request bitcoin#244
2d2707a travis: test i686 builds with gmp
cf7f702 travis: update to new build infrastructure
bb0ea50 Replace set/add with cmov in secp256k1_gej_add_ge.
f3d3519 Merge pull request bitcoin#241
5c2a4fa Fix memory leak in context unit test
14aacdc Merge pull request bitcoin#239
93226a5 secp256k1.c: Add missing DEBUG_CHECKs for sufficiently capable contexts
6099220 Merge pull request bitcoin#237
6066bb6 Fix typo: avg -> max
9688030 Merge pull request bitcoin#236
d899b5b Expose ability to deep-copy a context
3608c7f Merge pull request bitcoin#208
a9b6595 [API BREAK] Introduce explicit contexts
a0d3b89 Merge pull request bitcoin#233
9e8d89b Merge pull request bitcoin#234
65e70e7 Merge pull request bitcoin#235
5098f62 Improve documentation formatting consistency
4450e24 Add a comment about the avoidance of secret data in array indexes.
6534ee1 initialize variable
d5b53aa Merge pull request bitcoin#232
c01df1a Avoid some implicit type conversions to make C++ compilers happy.
bfe96ba Merge pull request bitcoin#231
33270bf Add a couple comments pointing to particular sections of RFC6979.
41603aa Merge pull request bitcoin#230
2632019 Brace all the if/for/while.
1897b8e Merge pull request bitcoin#229
efc571c Add simple testcases for signing with rfc6979 extra entropy.
1573a10 Add ability to pass extra entropy to rfc6979
3087bc4 Merge pull request bitcoin#228
d9b9f11 Merge pull request bitcoin#218
0065a8f Eliminate multiple-returns from secp256k1.c.
354ffa3 Make secp256k1_ec_pubkey_create reject oversized secrets.
27bc131 Silence some warnings from pedantic static analysis tools, improve compatibility with C++.
3b7ea63 Merge pull request bitcoin#221
f789c5b Merge pull request bitcoin#215
4bc273b Merge pull request bitcoin#222
137a8ec Merge pull request bitcoin#216
7c3771d Disable overlength-strings warnings.
8956111 use 128-bit hex seed
02efd06 Use RFC6979 for test PRNGs
ae55e85 Use faster byteswapping and avoid alignment-increasing casts.
443cd4b Get rid of hex format and some binary conversions
0bada0e Merge bitcoin#214: Improve signing API documentation & specification
8030d7c Improve signing API documentation & specification
7b2fc1c Merge bitcoin#213: Removed gotos, which are hard to trace and maintain.
11690d3 Removed gotos, which are hard to trace and maintain.
122a1ec Merge pull request bitcoin#205
035406d Merge pull request bitcoin#206
2d4cd53 Merge pull request bitcoin#161
34b898d Additional comments for the testing PRNG and a seeding fix.
6efd6e7 Some comments explaining some of the constants in the code.
ffccfd2 x86_64 assembly optimization for scalar_4x64
67cbdf0 Merge pull request bitcoin#207
039723d Benchmarks for all internal operations
6cc8425 Include a comment on secp256k1_ecdsa_sign explaining low-s.
f88343f Merge pull request bitcoin#203
d61e899 Add group operation counts
2473f17 Merge pull request bitcoin#202
b5bbce6 Some readme updates, e.g. removal of the GMP field.
f0d851e Merge pull request bitcoin#201
a0ea884 Merge pull request bitcoin#200
f735446 Convert the rest of the codebase to C89.
bf2e1ac Convert tests to C89. (also fixes a use of bare "inline" in field)
fc8285f Merge pull request bitcoin#199
fff412e Merge pull request bitcoin#197
4be8d6f Centralize the definition of uint128_t and use it uniformly.
d9543c9 Switch scalar code to C89.
fcc48c4 Remove the non-storage cmov
55422b6 Switch ecmult_gen to use storage types
41f8455 Use group element storage type in EC multiplications
e68d720 Add group element storage type
ff889f7 Field storage type
7137be8 Merge pull request bitcoin#196
0768bd5 Get rid of variable-length hex string conversions
e84e761 Merge pull request bitcoin#195
792bcdb Covert several more files to C89.
45cdf44 Merge pull request bitcoin#193
17db09e Merge pull request bitcoin#194
402878a fix ifdef/ifndef
25b35c7 Convert field code to strict C89 (+ long long, +__int128)
3627437 C89 nits and dead code removal.
a9f350d Merge pull request bitcoin#191
4732d26 Convert the field/group/ecdsa constant initialization to static consts
19f3e76 Remove unused secp256k1_fe_inner_{start, stop} functions
f1ebfe3 Convert the scalar constant initialization to static consts
50cc6ab Merge pull request bitcoin#178
941e221 Add tests for handling of the nonce function in signing.
10c81ff Merge pull request bitcoin#177
7688e34 Add magnitude limits to secp256k1_fe_verify to ensure that it's own tests function correctly.
4ee4f7a Merge pull request bitcoin#176
70ae0d2 Use secp256k1_fe_equal_var in secp256k1_fe_sqrt_var.
7767b4d Merge pull request bitcoin#175
9ab9335 Add a reference consistency test to ge_tests.
60571c6 Rework group tests
d26e26f Avoid constructing an invalid signature with probability 1:2^256.
b450c34 Merge pull request bitcoin#163
d57cae9 Merge pull request bitcoin#154
49ee0db Add _normalizes_to_zero_var variant
eed599d Add _fe_normalizes_to_zero method
d7174ed Weak normalization for secp256k1_fe_equal
0295f0a weak normalization
bbd5ba7 Use rfc6979 as default nonce generation function
b37fbc2 Implement SHA256 / HMAC-SHA256 / RFC6979.
c6e7f4e [API BREAK] Use a nonce-generation function instead of a nonce
cf0c48b Merge pull request bitcoin#169
603c33b Make signing fail if a too small buffer is passed.
6d16606 Merge pull request bitcoin#168
7277fd7 Remove GMP field implementation
e99c4c4 Merge pull request bitcoin#123
13278f6 Add explanation about how inversion can be avoided
ce7eb6f Optimize verification: avoid field inverse
a098f78 Merge pull request bitcoin#160
38acd01 Merge pull request bitcoin#165
6a59012 Make git ignore bench_recover when configured with benchmark enabled
1ba4a60 Configure options reorganization
3c0f246 Merge pull request bitcoin#157
808dd9b Merge pull request bitcoin#156
8dc75e9 Merge pull request bitcoin#158
28ade27 build: nuke bashisms
5190079 build: use subdir-objects for automake
8336040 build: disable benchmark by default
bccaf86 Merge pull request bitcoin#150
2a53a47 Merge pull request bitcoin#151
5f5a31f Merge pull request bitcoin#149
3907277 Merge pull request bitcoin#142
a3e0611 Enable tests in x86 travis builds
45da235 x86 builder
8bb0e93 Merge pull request bitcoin#155
971fe81 build: fix openssl detection for cross builds
f22d73e Explicitly access %0..%2 as 64-bit so we use the right registers for x32 ABI
e66d4d6 Avoid the stack in assembly and use explicit registers
cf7b2b4 Fix ECDSA message hashes to 32 bytes
056ad31 Really compile with -O3 by default
74ad63a Merge pull request bitcoin#146
9000458 Merge pull request bitcoin#145
1f46b00 build: fix __builtin_expect detection for clang
aaba2e0 Merge pull request bitcoin#136
8a0775c Merge pull request bitcoin#144
ee1eaa7 Merge pull request bitcoin#141
c88e2b8 Compile with -O3 by default
6558a26 Make the benchmarks print out stats
000bdf6 Rename bench_verify to bench_recovery
7c6fed2 Add a few more additional tests.
992e03b travis: add clang to the test matrix
b43b79a Merge pull request bitcoin#143
e06a924 Include time.h header for time().
8d11164 Add some additional tests.
3545627 Merge pull request bitcoin#118
6a9901e Merge pull request bitcoin#137
376b28b Merge pull request bitcoin#128
1728806 Merge pull request bitcoin#138
a5759c5 Check return value of malloc
39bd94d Variable time normalize
ad86bdf Merge pull request bitcoin#140
54b768c Another redundant secp256k1_fe_normalize
69dcaab Merge pull request bitcoin#139
1c29f2e Remove redundant secp256k1_fe_normalize from secp256k1_gej_add_ge_var.
2b9388b Remove unused secp256k1_fe_inv_all
f461b76 Allocate precomputation arrays on the heap
b2c9681 Make {mul,sqr}_inner use the same argument order as {mul,sqr}
6793505 Convert YASM code into inline assembly
f048615 Rewrite field assembly to match the C version
3ce74b1 Tweak precomputed table size for G

git-subtree-dir: src/secp256k1
git-subtree-split: 22f60a6
deadalnix pushed a commit to deadalnix/bitcoin that referenced this pull request Dec 13, 2016
Prevent the regression test from using a port that is arleady in use
deadalnix pushed a commit to deadalnix/bitcoin that referenced this pull request Jan 19, 2017
7688e34 Add magnitude limits to secp256k1_fe_verify to ensure that it's own tests function correctly. (Gregory Maxwell)
70ae0d2 Use secp256k1_fe_equal_var in secp256k1_fe_sqrt_var. (Gregory Maxwell)
classesjack pushed a commit to classesjack/bitcoin that referenced this pull request Jan 2, 2018
…king

Fix mempool processing for EVM transaction mining
cryptapus added a commit to cryptapus/bitcoin that referenced this pull request Feb 18, 2020
doc: Additional MIPS documentation added.
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Mar 16, 2021
…ig Sur with old Qt"

77833a3 Revert "qt: Use "fusion" style on macOS Big Sur with old Qt" (Hennadii Stepanov)

Pull request description:

  This PR reverts workaround introduced in bitcoin#177.

  After bumping Qt version in depends to 5.12.10 in bitcoin#21376, there are no reasons to use the Fusion style on macOS.

ACKs for top commit:
  leonardojobim:
    tACK bitcoin-core/gui@77833a3. Tested on macOS Big Sur v11.2.3
  jarolrod:
    ACK 77833a3
  Talkless:
    utACK 77833a3

Tree-SHA512: f704f2027dd380dfc604231e3606a036a8be891aeeddf643c474131014fa080e123b42836ac643a2064fe7a5a018fa8b9aa61a31f9da1d15880de6a36c4c0d54
cryptapus pushed a commit to cryptapus/bitcoin that referenced this pull request May 3, 2021
1577845 Remove some whitespace (Mark Polyakov)
0c8b1e7 removed non-functional DNS seeds (Mark Polyakov)

Pull request description:

  Removed DNS seeds that do not return a list of Namecoin peers.

Tree-SHA512: 8a1b1939118321d5660a1698b03c0337bfdcadc7e3147e2924d73912ce5d800f6c3d89c2ce2656048d868e9bcd4bd00a681fa0cdb125a416d17608f27832eaa2
rajarshimaitra pushed a commit to rajarshimaitra/bitcoin that referenced this pull request Aug 5, 2021
- removed incorrect comma in front of "as well as"
- added "both" to make it stronger that LN has 2 main functionalities
- "... on the network." leaves it undefined. The reader might ask to which netowrk it refers to? To the before mentioned netowrk of payment-channels? Added "Bitcoin" to clarify.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants