Skip to content

Adapted to biicode via biicode.conf, ignore.bii and CMakeLists.txt - #104

Merged
vitaut merged 1 commit into
fmtlib:masterfrom
franramirez688:master
Feb 11, 2015
Merged

Adapted to biicode via biicode.conf, ignore.bii and CMakeLists.txt#104
vitaut merged 1 commit into
fmtlib:masterfrom
franramirez688:master

Conversation

@franramirez688

Copy link
Copy Markdown
Contributor

It's a full adaptation of cppformat to biicode. Travis has mixed building with and without biicode at same compilation time to keep your library free of bugs in both building systems.

If you want to publish the repo to biicode directly when you make any modification, add to your biicode.conf the parent, e.g.:

[parent]
     vitaut/cppformat: 0

and execute:

$ bii publish

to publish the block as DEV in vitaut/cppformat

I just added a folder named biicode/ with cmake/ and samples/ subfolders to make possible this adaptation and .travis.yml can build an executable with biicode

@vitaut

vitaut commented Feb 9, 2015

Copy link
Copy Markdown
Contributor

Thanks for the PR. Unfortunately the Travis build fails on OS X https://travis-ci.org/cppformat/cppformat/jobs/50072282, because it doesn't have apt-get.

@franramirez688

Copy link
Copy Markdown
Contributor Author

I'll fix the OSX Travis building, and update the PR

@vitaut

vitaut commented Feb 9, 2015

Copy link
Copy Markdown
Contributor

Thanks. BTW I recommend moving any nontrivial logic to a separate (Python) script as it is done here: https://github.com/ampl/mp/blob/master/.travis.yml & https://github.com/ampl/mp/blob/master/support/travis-build.py, because Travis config is not great for embedding scripts with logic (unless I'm missing something).

@franramirez688

Copy link
Copy Markdown
Contributor Author

I just updated it ;)

@franramirez688

Copy link
Copy Markdown
Contributor Author

I'm working on separating it like you said :) I'll try to update it today

Cheers,
Fran

@vitaut

vitaut commented Feb 10, 2015

Copy link
Copy Markdown
Contributor

Thanks, Fran.

@franramirez688
franramirez688 force-pushed the master branch 21 times, most recently from 1fc5916 to 2352187 Compare February 11, 2015 16:14
@franramirez688

Copy link
Copy Markdown
Contributor Author

I just separated Travis build support for biicode in a .sh file (python script gave me some problems with the subprocess check_call() method). The only thing I changed from original one was to update the CMake version in your Travis file because biicode uses CMake 3.x.

I hope it fits.
Cheers,
Fran

@vitaut

vitaut commented Feb 11, 2015

Copy link
Copy Markdown
Contributor

Looks good, thanks. One minor thing: is it possible to move Biicode-related files biicode.conf and ignore.bii from top-level to the biicode directory?

@franramirez688

Copy link
Copy Markdown
Contributor Author

For now, it's no possible :( biicode.conf has to be into the root directory to be processed. ignore.bii could move into subfolders but in this case it's ignoring some parent folders that's why it's to be in top-level dir.

@vitaut

vitaut commented Feb 11, 2015

Copy link
Copy Markdown
Contributor

OK, this is not very important. I just wanted to check if it is possible to keep the top-level directory less cluttered.

Looking at the diff https://github.com/cppformat/cppformat/pull/104/files#diff-354f30a63fb0907d4ad57269548329e3R24 I don't quite understand why change the permission every time:

 - chmod a+x biicode/support/travis-build.sh

I think it would be better to set the executable permission on the file in Git and get rid of this command.

@franramirez688

Copy link
Copy Markdown
Contributor Author

I just fixed it ;)

vitaut added a commit that referenced this pull request Feb 11, 2015
Adapted to biicode via biicode.conf, ignore.bii and CMakeLists.txt
@vitaut
vitaut merged commit 33f85ef into fmtlib:master Feb 11, 2015
@vitaut

vitaut commented Feb 11, 2015

Copy link
Copy Markdown
Contributor

Merged, thanks!

@vitaut

vitaut commented Feb 11, 2015

Copy link
Copy Markdown
Contributor

@franramirez688 BTW I tried to publish the repo to biicode as you suggested by adding

[parent]
     vitaut/cppformat: 0

and executing

$ bii publish

but I get an error:

ERROR: You're not in a valid project folder

Am I missing something?

@franramirez688

Copy link
Copy Markdown
Contributor Author

Ok, when you clone this repo to your PC, it isn't a biicode project yet, so you only have to follow these simple steps:

 $ bii init vitaut_project
 $ cd vitaut_project

Checkout the github repository in block folder:

 $ git clone git@github.com:cppformat/cppformat.git blocks/vitaut/cppformat
 $ # add to biicode.conf: [parent] vitaut/cppformat: 0, like you wrote above 
 $ bii publish

We're working on a new command to change these steps to more easier ones ;)

@franramirez688

Copy link
Copy Markdown
Contributor Author

If you want, I can add to the biicode/support/travis-build.sh a mechanism to publish into your biicode user account automatically each time you update your code in GitHub. So, you'd not have to spend time to do the previous steps

@vitaut

vitaut commented Feb 13, 2015

Copy link
Copy Markdown
Contributor

Thanks for the clarification, now I see how it works. Just published the updated version on Biicode.

If you want, I can add to the biicode/support/travis-build.sh a mechanism to publish into your biicode user account automatically each time you update your code in GitHub.

That would be awesome.

@franramirez688

Copy link
Copy Markdown
Contributor Author

Ok, so my next PR will bring it ;)

@vitaut

vitaut commented Feb 13, 2015

Copy link
Copy Markdown
Contributor

Thanks.

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.

2 participants