commit a2ccb90b8f6ed07883ab9283fb5edf1891ddd5cd
parent 0119130329b9862bee8eaa28bd24997545a5e0af
Author: Felicitus <felicitus@felicitus.org>
Date: Wed, 21 Dec 2011 08:34:13 +0100
Updated documentation bits
Diffstat:
5 files changed, 96 insertions(+), 146 deletions(-)
diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
PartKeepr Installation Instructions
-=================================
+===================================
1) Quick Installation
-Please read the file "documentation/QUICK-INSTALL"
+Point your browser to the setup/ directory
-2) Verbose Installation
+2) Developer Installation
-not written yet.-
\ No newline at end of file
+See documentation/developer-installation/+
\ No newline at end of file
diff --git a/documentation/developer-installation/DEBIAN-6.0 b/documentation/developer-installation/DEBIAN-6.0
@@ -0,0 +1 @@
+Please see UBUNTU-11.04, as the differences are minimal.+
\ No newline at end of file
diff --git a/documentation/developer-installation/UBUNTU-11.04 b/documentation/developer-installation/UBUNTU-11.04
@@ -0,0 +1,89 @@
+Step by Step Guide für Ubuntu 10.04
+===================================
+
+This guide explains how to setup your workstation so that you can develop using PartKeepr.
+
+This guide assumes that you are working as user root. Usually this isn't recommended, but to make it easier for you, we'll omit that.
+
+In this guide, I've used "/var/www" as web server root.
+
+apt-get install apache2 php5-mysql php5-curl php5-cli php-pear git php5-imagick php5-xsl php-apc imagemagick mysql-client mysql-server libapache2-mod-php5
+
+# Update PEAR
+
+pear update-channels
+pear upgrade
+
+# On Ubuntu Server, you need to install ia32-libs which are installed automatically on Ubuntu Desktop
+apt-get install ia32-libs
+apt-get install default-jdk
+
+# Install phpunit, phing
+
+pear config-set auto_discover 1
+pear channel-discover pear.phpunit.de
+pear install phpunit/PHPUnit
+pear channel-discover pear.phing.info
+pear install phing/phing
+
+pear install pear.doctrine-project.org/DoctrineORM
+pear install phpunit/phpcpd
+pear install --alldeps phpmd/PHP_PMD-alpha
+
+# You can
+# Create a new database
+mysql -uroot -p
+CREATE DATABASE partkeepr;
+grant usage on *.* to partkeepr@localhost identified by 'partkeepr';
+grant all privileges on partkeepr.* to partkeepr@localhost;
+quit
+
+# Test if you can connect
+mysql -upartkeepr -ppartkeepr
+quit
+
+# Setting up the PartKeepr repository
+cd /var/www
+
+# Cloning will take a while, approx 50MB repository will be downloaded
+git clone git://github.com/partkeepr/PartKeepr.git
+
+cd /var/www/PartKeepr
+
+# This will update the submodules. Another 200MB will be downloaded
+git submodule sync
+git submodule update
+
+cp config.php.template config.php
+
+# You have now two choices: Proceed with or without sample data.
+
+# ==== WITH SAMPLE DATA ====
+mysql -uroot -p
+CREATE DATABASE partdb;
+grant usage on *.* to partdb@localhost identified by 'partdb';
+grant all privileges on partdb.* to partdb@localhost;
+FLUSH PRIVILEGES;
+quit
+
+mysql -upartdb -ppartdb partdb < testing/setup.sql
+cd testing
+php SetupDatabase.php --yes --migrate
+
+# ==== WITHOUT SAMPLE DATA ====
+cd testing
+php SetupDatabase.php --yes
+
+# ==== Issuing migrations ====
+# Ignore all messages about "was executed but did not result in any SQL statements"
+cd /var/www/PartKeepr/
+php doctrine.php migrations:migrate
+
+# Build the frontend
+phing build
+
+# Restart apache2 to make sure php5 is enabled
+/etc/init.d/apache2 restart
+
+# Open up your browser and navigate to http://localhost/PartKeepr/frontend
+# The frontend should now appear
diff --git a/documentation/installation/DEBIAN-6.0 b/documentation/installation/DEBIAN-6.0
@@ -1,54 +0,0 @@
-The instructions are for Debian 6.0.
-
-IMPORTANT: I am not a Debian guru. As such, I wrote down all steps required to get a fully working partkeepr
-installation. - Felicitus
-
-# Install required Packages
-
-apt-get install apache2 php5 php-pear mysql-server php5-imagick php-apc
-
-# Set PEAR to auto-discover channels
-
-pear config-set auto_discover 1
-
-# Self-update PEAR and all updates
-
-pear upgrade-all
-
-# Install Doctrine ORM
-
-pear install pear.doctrine-project.org/DoctrineORM
-
-# Install the database
-
-apt-get install postgresql
-apt-get install mysql
-
-# Install the PHP5 modules for your database
-
-apt-get install php5-pgsql
-apt-get install php5-mysql
-
-# Optional: Install phing and related tools
-
-apt-get install php5-curl php5-xsl
-
-pear install pear.phing.info/phing
-
-pear channel-discover pear.pdepend.org
-pear install --alldeps pear.phpmd.org/PHP_PMD
-
-pear install pear.phpunit.de/phpcpd
-
-pear install pear.phpunit.de/phpunit
-pear install PhpDocumentor
-
-If you are on 64 bit arch, you need the ia32-libs for jsdb
-
-apt-get install ia32-libs
-
-# Install the JDK, needed for jsdb
-apt-get install default-jdk
-
-
-
diff --git a/documentation/installation/UBUNTU-11.04 b/documentation/installation/UBUNTU-11.04
@@ -1,87 +0,0 @@
-Step by Step Guide für Ubuntu 10.04
-
-
-This guide assumes that you are working as user root. Usually this isn't recommended, but to make it easier for you, we'll omit that.
-
-In this guide, I've used "/var/www" as web server root.
-
-apt-get install apache2 php5-mysql php5-curl php5-cli php-pear git php5-imagick php5-xsl php-apc imagemagick mysql-client mysql-server libapache2-mod-php5
-
-# Update PEAR
-
-pear update-channels
-pear upgrade
-
-# On Ubuntu Server, you need to install ia32-libs which are installed automatically on Ubuntu Desktop
-apt-get install ia32-libs
-apt-get install default-jdk
-
-# Install phpunit, phing
-
-pear config-set auto_discover 1
-pear channel-discover pear.phpunit.de
-pear install phpunit/PHPUnit
-pear channel-discover pear.phing.info
-pear install phing/phing
-
-pear install pear.doctrine-project.org/DoctrineORM
-pear install phpunit/phpcpd
-pear install --alldeps phpmd/PHP_PMD-alpha
-
-# You can
-# Create a new database
-mysql -uroot -p
-CREATE DATABASE partkeepr;
-grant usage on *.* to partkeepr@localhost identified by 'partkeepr';
-grant all privileges on partkeepr.* to partkeepr@localhost;
-quit
-
-# Test if you can connect
-mysql -upartkeepr -ppartkeepr
-quit
-
-# Setting up the PartKeepr repository
-cd /var/www
-
-# Cloning will take a while, approx 50MB repository will be downloaded
-git clone git://github.com/partkeepr/PartKeepr.git
-
-cd /var/www/PartKeepr
-
-# This will update the submodules. Another 200MB will be downloaded
-git submodule sync
-git submodule update
-
-cp config.php.template config.php
-
-# You have now two choices: Proceed with or without sample data.
-
-# ==== WITH SAMPLE DATA ====
-mysql -uroot -p
-CREATE DATABASE partdb;
-grant usage on *.* to partdb@localhost identified by 'partdb';
-grant all privileges on partdb.* to partdb@localhost;
-FLUSH PRIVILEGES;
-quit
-
-mysql -upartdb -ppartdb partdb < testing/setup.sql
-cd testing
-php SetupDatabase.php --yes --migrate
-
-# ==== WITHOUT SAMPLE DATA ====
-cd testing
-php SetupDatabase.php --yes
-
-# ==== Issuing migrations ====
-# Ignore all messages about "was executed but did not result in any SQL statements"
-cd /var/www/PartKeepr/
-php doctrine.php migrations:migrate
-
-# Build the frontend
-phing build
-
-# Restart apache2 to make sure php5 is enabled
-/etc/init.d/apache2 restart
-
-# Open up your browser and navigate to http://localhost/PartKeepr/frontend
-# The frontend should now appear
