Skip to content

Reverse merge from VerusCoin through master#21

Merged
miketout merged 95 commits intodevfrom
master
Sep 12, 2018
Merged

Reverse merge from VerusCoin through master#21
miketout merged 95 commits intodevfrom
master

Conversation

@miketout
Copy link
Copy Markdown
Owner

No description provided.

miketout and others added 30 commits May 15, 2018 04:01
Build instructions update
* Asher dev (#89)

* Adding Brewfile for fetching MacOS build dependencies with the brew bundle command.

* Updating version, annotating Mac fetch-params.sh for debugging

* Modify version to 0.3.10. (#90)
…ort AES or AVX instructions.

Removing deploy steps in Travis-CI to use as a sanity check on Github
saving progress on verus-cli windows InstallBuilder configuration xml
# Conflicts:
#	kmd/windows/verus-cli/README.txt
sync master and dev with VerusCoin/0.3.11
Merge latest Komodo changes, network decentralization, bug fixes
Staking and mining improvements
Put staking readout once per staking loop so people know it's staking
* Force portable code

* Switch to old MMX instructions, avoiding SSE & SSE2 instructions.

* Less agressive, leave verus code (which checks for it) using advanced instructions.

* Compiling only for windows

* Update .gitlab-ci.yml

* Try -march=native for C++ code generation.

* Tweaking machine architecture settings.

* Try native alone.

* Also get LIBCRYPTOCONDITIONS to -march=native

* Switch other lib to native as well.

* Try switching back further for CPU architecture.

* Even lower end settings.

* Turn on symbols.

* Use sse2,3 and 4 capable x64.

* Once again let verus lib use advances instructioins since it checjs via CPUID at run time.

* Modify a few more makefile entries.

* Switch to AMD model similar to our test system.

* Get snark makefile to k8 too.

* Yet another -march to modify to k8, or two of them.

* Brute force k8 settings, comment non-portable code out.

* Put the condition on cpuid back.

* Put non-portable advenced instruction code back

* Enable instructions.

* Add lib for separate settings.

* Update .gitlab-ci.yml

* Update .gitlab-ci.yml

* Update .gitlab-ci.yml

* Update .gitlab-ci.yml

* replacing k8-sse3 specific flags to x86-84

* updating versions
Asherda and others added 28 commits August 12, 2018 13:35
Finding and removing previous installations with installer
* removing genproclimit=0 parameter from verusd scripts

* removing gen parameter from verusd scripts
Updating versions to v0.3.12a-beta
changing brewfile dependency of gcc@5 to gcc@6
fixing broken dependencies
fix broken dependencies in build
… for blockchain, breaking other blockchains or asset chains
Updating version to 0.3.13
Configuring CI to post builds on Slack
Removing unnecessary shell script makeReleaseWindows.sh because its function was added to the .gitlab-ci.yml config.
Reverse merge release into working fork
@miketout miketout merged commit 0f92550 into dev Sep 12, 2018
miketout pushed a commit that referenced this pull request Sep 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants