One build directory per branch/arch. #4286

cslashm · 2018-08-20T15:29:25Z

One build directory per branch/arch.

This proposal allows to perform multiple compilation from different branch/arch in
separate directories.
Example:

    build
    ├── GNU_Linux
    │   ├── multi-compilation
    │   │   └── release
    │   └── NanoS-USBHID
    │       └── release
    └── Msys
        └── NanoS-USBHID
            └── release

Edit 1:

Try to handle special char as : / \ .

--data-dir in unit test not yet tested

Edit 2:

donot use param for uname. -o is not supported by MacOS.

moneromooo-monero · 2018-08-20T15:31:24Z

Makefile

@@ -26,105 +26,109 @@
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+
+subbuilddir:=$(shell uname -o|sed -e 's|/|_|g')/$(shell git branch |grep '\* ' |cut -f2 -d' ')


I think windows might not like that. Can someone with mingw test ?

I test it under win7. The sample tree is mine

moneromooo-monero · 2018-08-20T15:32:07Z

Makefile

-	mkdir -p build/debug
-	cd build/debug && cmake -D CMAKE_BUILD_TYPE=Debug ../..
+	mkdir -p build/$(subbuilddir)/debug
+	cd build/$(subbuilddir)/debug && cmake -D CMAKE_BUILD_TYPE=Debug ../../../..


If you have a branch name in this, then you need to start quoting.

And replacing / with something else (I do have a branch with a / in so it's not pedantic :P)

ooops, never thought about / in a branch name :D

Ok I will add some quote here and there and test with OMG branch name.(I just mod the Makefile for my own purpose and thought it could be useful for other with too slow machine :p)

moneromooo-monero · 2018-08-20T15:45:01Z

Also, check whether unit tests --data-dir need fixing to add two ../

stoffu · 2018-08-21T01:19:47Z

uname -o is unavailable for OSX. I think uname -s can be used instead.
I confirmed that all the tests work with the new directory structure without any modifications.
Some 3rd party software (most notably https://github.com/moneroexamples/openmonero, https://github.com/moneroexamples/onion-monero-blockchain-explorer, https://github.com/sammy007/monero-stratum) assume the existing build directory structure for building, so those authors might want to voice their opinions. CC: @moneroexamples @sammy007

moneroexamples · 2018-08-21T03:30:42Z

If these changes are beneficial for monero, then moneroexamples can be adopted to this change. However, I don't know how this change will propagate when checking out older monero releases, which I often do?

For example if I make new branch based on v12.3.0 (git checkout -b last_release v0.12.3.0) and compile this new branch to have v0.12.3 monero libraries, this new build directory scheme obviously will not be used. And this complicate things, at least till the new scheme will be made official with next monero release.

cslashm · 2018-08-21T08:24:35Z

Is it an acceptable solution (hack?) to copy in the old scheme the last binaries build?

sammy007 · 2018-08-22T14:53:12Z

@stoffu I only need cmake -DBUILD_SHARED_LIBS=1 . to be there due to CGO https://github.com/sammy007/monero-stratum#linux. If there is easy way to pass path to subdirectory via CMake it should not be a problem.

moneromooo-monero · 2018-09-10T09:19:34Z

I've tried it, and I realised it does spam the build tree a lot. If you have lots of branches, you end up having to manually clean all the time.
I've made it optionally off: http://paste.debian.net/hidden/04b09457/

luigi1111 · 2018-09-10T20:05:43Z

@cslashm please rebase.

cslashm · 2018-09-12T18:57:56Z

@moneromooo-monero nice idea, I will mod

@luigi1111, I merge the proposition from moneromooo and rebase that. I hope tomorrow, the day after else.

cslashm · 2018-09-13T07:43:26Z

Off option added
clean-all rule added to remove ALL builds
master rebased

stoffu · 2018-09-13T08:27:24Z

If I build with HEAD detached, space and parenthesis characters in the build directory name cause syntax errors:

/bin/sh: -c: line 0: syntax error near unexpected token `('
/bin/sh: -c: line 0: `echo "WARNING: Back-up your wallet if it exists within ./"build/Darwin/(HEAD detached at upstream_pr_4286)"!" ;         read -r -p "This will destroy the build directory, continue (y/N)?: " CONTINUE; [ $CONTINUE = "y" ] || [ $CONTINUE = "Y" ] || (echo "Exiting."; exit 1;)'
make: *** [clean] Error 2

Fix:

@@ -28,7 +28,7 @@
 
 ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain
 
-subbuilddir:=$(shell echo  `uname | sed -e 's|[:/\\]|_|g'`/`git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\]|_|g'`)
+subbuilddir:=$(shell echo  `uname | sed -e 's|[:/\\ \(\)]|_|g'`/`git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g'`)
 ifeq ($(USE_SINGLE_BUILDDIR),)
   builddir="build/$(subbuilddir)"
 else

stoffu · 2018-09-13T08:33:26Z

As for 3rd party software:

@moneroexamples
The only requirement is to pass the USE_SINGLE_BUILDDIR switch to the command:

USE_SINGLE_BUILDDIR=1 make

@sammy007
Ah, your software assumes cmake to be called directly from the command line. Then I think this patch has no effect for it.

cslashm · 2018-09-13T09:42:49Z

@stoffu add both: your last proposition-edit plus a modification of your first one in clean rule

MoroccanMalinois · 2018-09-13T12:09:56Z

Makefile

+  builddir="build/$(subbuilddir)"
+else
+  builddir="build"
+endif


This introduces distinct levels of subdirectories, but the number of ../ is fixed. So for me, it doesn't work when using USE_SINGLE_BUILDDIR=1

Sorry, I used -C all the time...
https://paste.debian.net/hidden/3254c3ef/

My fault too I would have to test it...

This proposal allows to perform multiple compilation from different branch/arch in separate directories. Example: build ├── GNU_Linux │ ├── multi-compilation │ │ └── release │ └── NanoS-USBHID │ └── release └── Msys └── NanoS-USBHID └── release Edit 1: Try to handle special char as : / \ . --data-dir in unit test not yet tested Edit 2: donot use param for uname. -o is not supported by MacOS.

fluffypony

Reviewed

b4679f3 One build directory per branch/arch. (cslashm)

moneromooo-monero reviewed Aug 20, 2018

View reviewed changes

cslashm force-pushed the multi-compilation branch 3 times, most recently from dd46e3d to 285e6c7 Compare August 20, 2018 21:23

cslashm force-pushed the multi-compilation branch from 285e6c7 to e31ea98 Compare August 21, 2018 08:37

moneromooo-monero approved these changes Sep 6, 2018

View reviewed changes

cslashm force-pushed the multi-compilation branch from f9006ba to ea96ceb Compare September 13, 2018 07:41

cslashm force-pushed the multi-compilation branch 2 times, most recently from f62a5e7 to 02d8bfc Compare September 13, 2018 09:35

stoffu approved these changes Sep 13, 2018

View reviewed changes

MoroccanMalinois suggested changes Sep 13, 2018

View reviewed changes

cslashm force-pushed the multi-compilation branch from 02d8bfc to b4679f3 Compare September 13, 2018 15:36

stoffu approved these changes Sep 14, 2018

View reviewed changes

MoroccanMalinois approved these changes Sep 14, 2018

View reviewed changes

fluffypony approved these changes Sep 14, 2018

View reviewed changes

fluffypony merged commit b4679f3 into monero-project:master Sep 14, 2018

fluffypony added a commit that referenced this pull request Sep 14, 2018

Merge pull request #4286

c6f57d9

b4679f3 One build directory per branch/arch. (cslashm)

stoffu mentioned this pull request Dec 17, 2018

Build-related upstream patches 1 aeonix/aeon#88

Merged

cslashm deleted the multi-compilation branch March 21, 2019 15:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

One build directory per branch/arch. #4286

One build directory per branch/arch. #4286

cslashm commented Aug 20, 2018 •

edited

Loading

moneromooo-monero Aug 20, 2018

cslashm Aug 20, 2018

moneromooo-monero Aug 20, 2018

moneromooo-monero Aug 20, 2018

cslashm Aug 20, 2018

moneromooo-monero commented Aug 20, 2018

stoffu commented Aug 21, 2018 •

edited

Loading

moneroexamples commented Aug 21, 2018 •

edited

Loading

cslashm commented Aug 21, 2018 •

edited

Loading

sammy007 commented Aug 22, 2018 •

edited

Loading

moneromooo-monero commented Sep 10, 2018

luigi1111 commented Sep 10, 2018

cslashm commented Sep 12, 2018

cslashm commented Sep 13, 2018 •

edited

Loading

stoffu commented Sep 13, 2018 •

edited

Loading

stoffu commented Sep 13, 2018

cslashm commented Sep 13, 2018

MoroccanMalinois Sep 13, 2018 •

edited

Loading

moneromooo-monero Sep 13, 2018

cslashm Sep 13, 2018

fluffypony left a comment

One build directory per branch/arch. #4286

One build directory per branch/arch. #4286

Conversation

cslashm commented Aug 20, 2018 • edited Loading

moneromooo-monero Aug 20, 2018

Choose a reason for hiding this comment

cslashm Aug 20, 2018

Choose a reason for hiding this comment

moneromooo-monero Aug 20, 2018

Choose a reason for hiding this comment

moneromooo-monero Aug 20, 2018

Choose a reason for hiding this comment

cslashm Aug 20, 2018

Choose a reason for hiding this comment

moneromooo-monero commented Aug 20, 2018

stoffu commented Aug 21, 2018 • edited Loading

moneroexamples commented Aug 21, 2018 • edited Loading

cslashm commented Aug 21, 2018 • edited Loading

sammy007 commented Aug 22, 2018 • edited Loading

moneromooo-monero commented Sep 10, 2018

luigi1111 commented Sep 10, 2018

cslashm commented Sep 12, 2018

cslashm commented Sep 13, 2018 • edited Loading

stoffu commented Sep 13, 2018 • edited Loading

stoffu commented Sep 13, 2018

cslashm commented Sep 13, 2018

MoroccanMalinois Sep 13, 2018 • edited Loading

Choose a reason for hiding this comment

moneromooo-monero Sep 13, 2018

Choose a reason for hiding this comment

cslashm Sep 13, 2018

Choose a reason for hiding this comment

fluffypony left a comment

Choose a reason for hiding this comment

cslashm commented Aug 20, 2018 •

edited

Loading

stoffu commented Aug 21, 2018 •

edited

Loading

moneroexamples commented Aug 21, 2018 •

edited

Loading

cslashm commented Aug 21, 2018 •

edited

Loading

sammy007 commented Aug 22, 2018 •

edited

Loading

cslashm commented Sep 13, 2018 •

edited

Loading

stoffu commented Sep 13, 2018 •

edited

Loading

MoroccanMalinois Sep 13, 2018 •

edited

Loading