Oolite Bulletins

another_commander wrote:

Once it's done, there are some submodules that need to be dealt with. Do:
git submodule update --init

This will get you the complete source tree, including any and all binary resources (textures, sounds, dependency dlls etc.).

Thargoid wrote:

One question for the future, can the build environment and the git shell be merged, like you could do with SVN to do the whole repo synch and build in one window?

getcp.exe
git-receive-pack.exe
git-upload-archive.exe
git-upload-pack.exe
git.exe
gitk
libiconv2.dll

Thargoid wrote:

OK, pulled the GUI and installed the command line suite (which Zonealarm seemed to imply was a P2P worm...). During the installation had the option to include the set-up in the Windows PATH, so did so and having done so the full build process now works from the A_C build environment without any further tweaking or executable file moving.

So all is good, although I now need to have a file sort-out to get things properly arranged and to ditch the SVN build files.

One last question - is git pull enough to keep both main and submodule components up to date, or is something else needed for the latter? Presuming of course that the build isn't changed to another branch.

Thargoid wrote:

OK, so that wasn't the GUI I had - mine was this one from the github.com site. It worked, but seems a bit more self-integrated and freestanding rather than being based on the CLI.
<snip>

Gimi wrote:

Thargoid wrote:

OK, pulled the GUI and installed the command line suite (which Zonealarm seemed to imply was a P2P worm...). During the installation had the option to include the set-up in the Windows PATH, so did so and having done so the full build process now works from the A_C build environment without any further tweaking or executable file moving.

So all is good, although I now need to have a file sort-out to get things properly arranged and to ditch the SVN build files.

One last question - is git pull enough to keep both main and submodule components up to date, or is something else needed for the latter? Presuming of course that the build isn't changed to another branch.

I installed the command line suite and this.
While I run most things from the command line, this GUI runs on top of the CLI and gives warnings (small icons) beside the appropriate command button in order to keep stuff up to date. So if I need to pull two files in a certain branch, a small red "2" appears beside the pull button when I go into that branch. Only downside, it was a pain to sort out the ssh key needed to log onto github.

I find git's command line very simple to use and I really don't think a gui would be necessary. Here is a very quick guide on how to compile Oolite's source from github. We will assume that we will do all the work inside C:\OoliteDev:

First-time cloning of source tree:
1. Launch git's shell (I use git-bash.bat to do this).


2. At the command prompt type:
cd /c/OoliteDev
git clone https://github.com/OoliteProject/oolite.git


3. The repository will be cloned inside the folder 'oolite'. Once it's done, there are some submodules that need to be dealt with. Do:
cd oolite
git submodule update --init

This will get you the complete source tree, including any and all binary resources (textures, sounds, dependency dlls etc.).


4. Exit git shell.


5. Start up the compiler shell, navigate to the root folder you just cloned (/c/OoliteDev/oolite), proceed as usual to compile.
Note: If your computer has a multi-core CPU, you can use make's -j[number of threads] switch to make it compile ultra-fast. Assuming a 4-core CPU:
make -fMakefile release -j4 will build you a test-release executable, ready to run inside c:\OoliteDev\oolite\oolite.app within seconds.




Subsequent local updates of the source:
1. Launch git's shell.


2. At the command prompt type:
cd /c/OoliteDev/oolite
[OPTIONAL] git checkout branchName [/OPTIONAL] (switches you from master to the branch called branchName)
git pull


3. Exit git shell.


4. Start up the compiler shell, navigate to /c/OoliteDev/oolite.


5. If you have just switched branches, do
make -fMakefile clean
Don't miss this step, otherwise you might end up in a mess of branch-crossed object files, with failure to compile almost guaranteed.


6. Proceed with compiling as usual.

dertien wrote:

So in a nutshell, you can use the sourcetree terminal to retrieve the files and msys.bat terminal to compile.