Differences

This shows you the differences between two versions of the page.

--- en:mac_osx [2010/10/17 15:36] – external edit 127.0.0.1
+++ en:mac_osx [Unknown date] (current) – external edit (Unknown date) 127.0.0.1
@@ Line 1: / Line 1: @@
-====== Psi+ и Mac OS ======
-Psi+ on Mac OS X Leopard 10.5: Patching & Building Instructions
 ===== Building the Psi+ on Mac OS X "from scratch" (the bare system) =====
-Consider the following example: Psi+ on Mac OS X  Snow Leopard 10.6.
+==== What is needed? ====
-This example is relevant for Leopard 10.5.
+OS X 64-bit.
-==== What is needed? ====
 To build the application in the system must be installed:
-  * Qt 4.6.x
+  * Qt 4.7.x 32-bit/64-bit x86 universal
-  * Xcode 3.x.x
+  * Xcode
-  * qconf
+  * git
-  * wget
@@ Line 26: / Line 16: @@
 ==== Process ====
-  * Install the program **qconf**:
+Download Qt sources, extract, then at terminal go to qt sources folder and do commands:
-      * download from the site at http://delta.affinix.com/qconf/
-      * extract and in the program directory run the command:
 <code>
-./configure && make && sudo make install
+curl -o 4.8.2_mac_10.5.diff https://raw.github.com/psi-im/psideps/master/qt/patches/4.8.2_mac_10.5.diff
-</code>
+patch -p1 < 4.8.2_mac_10.5.diff
-  * Install the program **wget**:
+./configure -release -arch x86 -arch x86_64 -sdk /Developer/SDKs/MacOSX10.5.sdk
-      * download from the site at http://ftp.gnu.org/gnu/wget/
+make
-      * extract and in the program directory run the command:
+sudo make install
-<code>
-./configure && make && sudo make install
 </code>
-  * Download the source code from the Psi git repository:
+Download script for automate Psi+ compilling:
 <code>
-git clone git://git.psi-im.org/psi.git && cd psi && git submodule init && git submodule update && git pull && git submodule update
+curl -o psibuild https://raw.github.com/psi-plus/maintenance/master/scripts/macosx/psibuild.command
 </code>
-  * Download all patches and install them:
+Set QTDIR variable like this: QTDIR=/usr/local/Trolltech/Qt-4.8.2
+Run script:
 <code>
-cd && svn co http://psi-dev.googlecode.com/svn/trunk/patches/ psi && cd psi && cd ~/psi && cat patches *.diff | patch -p1
+QTDIR=/usr/local/Trolltech/Qt-4.8.2 sh psibuild
-cd ~ && cd psi/iconsets && svn co http://psi-dev.googlecode.com/svn/trunk/iconsets/psiplus && cd ~/psi
 </code>
-  * Download the missing system iconset for Psi+
+Also you can add next line to your ~/.profile file:
 <code>
-cd ~ && cd psi/iconsets/system/default && svn co http://psi-dev.googlecode.com/svn/trunk/iconsets/system/default/psiplus && cd ~/psi
+export QTDIR=/usr/local/Trolltech/Qt-4.8.2
 </code>
+and restart terminal.
-  * Configure and compile by running in the Psi catalog the command:
+The script downloads all the dependences necessary for Psi+ and makes a package. The working directory ~/psi will be created in which you can fined psi-plus-xxxx.dmg
-<code>
-qconf && ./configure --disable-qdbus --enable-plugins && make
-</code>
-  * Finally:
-    At //~/psi/src// is ready the binary file, you can copy this file to the folder "Programs"
-==== Installing addons ====
-If you need to install additional emoticons, icons, mood or Russian localization then do the following:
-=== Client iconsets ===
+For manual dependences compilling run script with -b key:
 <code>
-cd /Applications/psi.app/Contents/Resources/iconsets/ && svn co http://psi-dev.googlecode.com/svn/trunk/iconsets/clients
+sudo mkdir /psidepsbase
+sudo chmod 777 /psidepsbase
+sh psibuild -b
 </code>
+Thus in an automatic mode downloads all necessary dependences (find them is possible in a /psidepsbase folder)
+For compilling Psi+ with webkit use -w key:
-=== Emoticons ===
 <code>
-cd /Applications/psi.app/Contents/Resources/iconsets/emoticons
+sh psibuild -w
-wget http://psi-dev.googlecode.com/svn/trunk/iconsets/emoticons/lk_35x35x138_tasha.jisp
-wget http://psi-dev.googlecode.com/svn/trunk/iconsets/emoticons/tasha_18x18x93.jisp
 </code>
+For inclusion in a package translations files it is possible to set variable TRANSLATIONS in which through a blank specify necessary languages:
-=== Activities ===
 <code>
-cd /Applications/psi.app/Contents/Resources/iconsets/ && svn co http://psi-dev.googlecode.com/svn/trunk/iconsets/activities
+TRANSLATIONS="ru de" sh psibuild
 </code>
+For inclusion of all available languages use --with-translations key:
-=== Moods ===
 <code>
-cd /Applications/psi.app/Contents/Resources/iconsets/ && svn co http://psi-dev.googlecode.com/svn/trunk/iconsets/moods
+sh psibuild --with-translations
 </code>
+For OTR-Plugin compilling use --with-devplugins key:
-=== Affiliations ===
 <code>
-cd /Applications/psi.app/Contents/Resources/iconsets/ && svn co http://psi-dev.googlecode.com/svn/trunk/iconsets/affiliations
+sh psibuild --with-devplugins
 </code>
+Keys of a script can be combined:
-=== Russian localization ===
 <code>
-cd /Applications/psi.app/Contents/Resources/ && wget http://psi-ru.googlecode.com/svn/branches/psi-plus/psi_ru.qm
+sh psibuild --with-devplugins --with-translations -w -b
 </code>