diff --git a/doc/Building.txt b/doc/Building.txt index 28aeba1..6bd0753 100644 --- a/doc/Building.txt +++ b/doc/Building.txt @@ -3,8 +3,8 @@ Building from Source Prerequisites ------------------------------------------------------------------------------- -Building Fuel from source requires Qt version 4. Qt is available at: - http://qt.nokia.com/downloads +Building Fuel from source requires Qt version 4 or 5. Qt is available at: + http://www.qt.io/download-open-source/ To run Fuel a compiled binary of Fossil must be available either in the system path or in the same folder as the Fuel executable. You can find the latest @@ -15,17 +15,16 @@ Fossil binaries from the Fossil homepage at: Retrieving the source ------------------------------------------------------------------------------- The source is available as a tar.gz archive at the following location - https://fuel-scm.googlecode.com/files/fuel-{VERSION}.tar.gz -So for version 0.9.6 the package name would be fuel-0.9.6.tar.gz + http://fuelscm.org/fossil/wiki?name=Downloads -Additionally you can clone the source code directly from Chisel using fossil +Additionally you can clone the source code directly from our site using fossil mkdir fuel cd fuel - fossil clone https://chiselapp.com/user/karanik/repository/fuel fuel.fossil + fossil clone http://fuelscm.org/fossil fuel.fossil fossil open fuel.fossil -Windows +Windows (Qt4) ------------------------------------------------------------------------------- 1. Open a Command Prompt and cd into the folder containing the Fuel source code cd fuel @@ -73,22 +72,28 @@ Mac OS X ------------------------------------------------------------------------------- Build Steps: -1. Open a Terminal and cd into the folder containing the Fuel source code +1. Open a Terminal and add your Qt bin folder to the path + export PATH=$PATH:/path/to/qt/version/clang_64/bin + +2. Go into the folder containing the Fuel source code cd fuel -2. Generate the makefile with qmake - /path/to/qt/bin/qmake fuel.pro -spec macx-g++ CONFIG+=release +3. Generate localization files + intl/convert.sh -3. Build the project +4. Generate the makefile with qmake + qmake fuel.pro -spec macx-clang CONFIG+=release + +5. Build the project make -4. (Optional) Include the Fossil executable within the Fuel application bundle +6. (Optional) Include the Fossil executable within the Fuel application bundle cp /location/to/fossil Fuel.app/Contents/MacOS -5. Package Qt dependencies into Fuel to make a standalone application bundle - /path/to/qt/bin/macdeployqt Fuel.app +7. Package Qt dependencies into Fuel to make a standalone application bundle + macdeployqt Fuel.app -6. Enjoy +8. Enjoy open Fuel.app @@ -99,12 +104,15 @@ Build Steps: 1. cd into the folder containing the Fuel source code cd fuel -2. Generate the makefile with qmake +2. Generate localization files + intl/convert.sh + +3. Generate the makefile with qmake qmake fuel.pro -3. Build the project +4. Build the project make -4. Enjoy +5. Enjoy ./Fuel diff --git a/manifest b/manifest index 2f4a966..5f21ab3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Added\sTravis-CI\sbuild\n -D 2015-04-24T11:54:07.957 +C Updated\sbuild\sinstructions +D 2015-04-25T14:45:38.483 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -12,7 +12,7 @@ F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32 F debian/watch 34f0921ff100a3e16a7ad84dcc303731de830a60 F dist/arch/PKGBUILD 80dfadf4e2602f390e8b1119d0fc958e3c6f2b41 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e -F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381 +F doc/Building.txt b575c1eaecd1eb83a7ffc39931edc934d5cc49ec F doc/Changes.txt b03302545e4a6c0b16a30d623a7627f8aef65ef6 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F fuel.pro 844a18c3faf5239e0d0025d8b7feac3900c28e71 @@ -213,7 +213,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b -P f7f4a3c45d4eefbc9577821d83a47ccdbb495cc0 -R be8db796b6e1d4d0f347d21f1ad6bdc4 +P d25b1871b284843ab9abfc0635415ff2373c5ee1 +R 67431acdb13a5999c7d91f53289a7a51 U kostas -Z 29113408f77727bd0409e8a71ee7cabb +Z c791c7994e9d93c28cd41be669beaecc diff --git a/manifest.uuid b/manifest.uuid index 3a7f1f7..fbe8ee2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d25b1871b284843ab9abfc0635415ff2373c5ee1 \ No newline at end of file +3c5332bad121fe233106059c3217d61bf1741a73 \ No newline at end of file