Permalink
Browse files

Added several pictures and a Tuto for ImageMagick

  • Loading branch information...
benjaminvialle committed May 15, 2011
1 parent 433fcd1 commit e89b577564cd23a7f32f9355fe95cda24f2aa329
View
@@ -0,0 +1,33 @@
+================================================================================
+Installing ImageMagick
+================================================================================
+
+GNU/Linux
+--------------------------------------------------------------------------------
+
+On Debian and Ubuntu, a simple ::
+
+ #> aptitude install imagemagick
+
+Mac OS X
+--------------------------------------------------------------------------------
+All instructions for installation are on ImageMagick website. [[Howto for
+ImageMagick
+installation|http://imagemagick.org/script/binary-releases.php#macosx]]
+
+Once ImageMagick has been added to your PATH, you can test it has been
+correctly installed, by doing:::
+
+ $> convert --version
+
+.. figure:: images/Installation_MacOsX-ImageMagick_test.png
+ :scale: 100%
+ :align: center
+ :alt: ImageMagick
+
+ Test for ImageMagick Installation
+
+Microsoft Windows
+--------------------------------------------------------------------------------
+
+.. TODO: Add ImageMagick installation on Windows
View
@@ -43,6 +43,17 @@ production. You may also experience database conflicts, in particular if you
want to test **PDF Conversion**. In case of PDF Conversion, you **MUST** use
PostgreSQL or MySQL
+Installing ImageMagick
+--------------------------------------------------------------------------------
+
+If you need to use test and work on image and PDF annotation, you will need
+ImageMagick. Otherwise, you can skip this part.
+
+* [[Setting up ImageMagick|ImageMagick]]
+
+If your want to test PDF conversion on MarkUs, don't forget to set to true the
+`PDF_SUPPORT` variable in `config/environments/development.rb`
+
Setting up the Database
--------------------------------------------------------------------------------
View
@@ -221,22 +221,30 @@ At the end, you will see a green message telling you everything is perfect:
Bundler complete message
+Installing ImageMagick
+--------------------------------------------------------------------------------
+
+If you need to use test and work on image and PDF annotation, you will need
+ImageMagick. Otherwise, you can skip this part.
+
+* [[Setting up ImageMagick|ImageMagick]]
+
+If your want to test PDF conversion on MarkUs, don't forget to set to true the
+`PDF_SUPPORT` variable in `config/environments/development.rb`
+
Getting Started with MarkUs Development
================================================================================
-Create databases:
-
-::
+Create databases:::
$> rake db:create:all # creates all the databases defined in config/database.yml
- $> rake db:create # creates the database defined in config/database.yml for your current RAILS_ENV
+ $> rake db:create # creates the database defined in config/database.yml
Next, you can execute some rake tasks to test your MarkUs installation.
Sometimes, the "Rake Tasks" view doesn't work in RadRails but you can run the
commands from the Terminal.
-Open the Terminal and <code>cd</code> to the MarkUs root directory. Then,
-enter the following commands: ::
+Enter the following commands: ::
$> rake db:migrate
$> rake db:schema:load
View
@@ -25,8 +25,8 @@ Microsoft Windows
Configuring SQLite3
================================================================================
-If you are using SQLite3, save the following text as config/database.yml (in
-the MarkUs root directory)::
+If you are using SQLite3, save the following text as `config/database.yml` (in
+the MarkUs root directory). You can use `config/database.yml.sqlite3` as example::
# SQLite version 3.x
# gem install sqlite3-ruby (not necessary on OS X Leopard)
@@ -51,19 +51,6 @@ the MarkUs root directory)::
pool: 5
timeout: 5000
-If you are using PostgreSQL, enter the following command (from the MarkUs root
-directory)::
-
- #>cp config/database.yml.postgresql config/database.yml
-
-If you are using MySQL, enter the following command (from the MarkUs root
-directory)::
-
- #>cp config/database.yml.mysql config/database.yml
-
-You can then uncomment the "development" section of <code>config/database.yml</code>.
-
-
Now go back to the MarkUs tutorial :
* Installation on GNU/Linux
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e89b577

Please sign in to comment.