Changeset 377

Show
Ignore:
Timestamp:
05/01/08 18:39:04 (2 years ago)
Author:
mygrant
Message:

Fix some typos, update some instructions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/Makefile

    r365 r377  
    101101 
    102102# Location of Mozilla tree for the MAR tools 
    103 MOZILLA := ~/mozilla 
     103MOZILLA := ~/devel/mozilla 
    104104 
    105105# Location for build staging 
    …… 
    186186build: 
    187187 
     188        @echo "Build step" 
    188189        @# Make sure the package directory exists 
    189190        mkdir -p $(BUILD) 
    …… 
    383384mar: 
    384385 
     386        @echo "MAR step" 
    385387        @# Making MAR files 
    386388ifeq (mac, $(PLATFORM)) 

  • trunk/uploadr/README.osx

    r370 r377  
    3232Install the Mac version of XULRunner, which will live in 
    3333/Library/Frameworks.  Then pull it into your fake Uploadr distribution: 
    34   $ mkdir UPLOADR/MacUplaodr.app/Contents/Frameworks 
     34  $ mkdir UPLOADR/MacUploadr.app/Contents/Frameworks 
    3535  $ sudo mv /Library/Frameworks/XUL.framework \ 
    3636    UPLOADR/MacUploadr.app/Contents/Frameworks 
    …… 
    8686  $ sudo port install libpng 
    8787 
    88 Download GraphicsMagick source: 
    89   ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/ 
     88Download GraphicsMagick source (try and stick with 1.1.10): 
     89  ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.1/GraphicsMagick-1.1.10.tar.bz2 
    9090 
    9191Configure and install GraphicsMagick: 
    …… 
    124124  $ sudo port install expat 
    125125  $ sudo port install xml2 
    126   $ ./configure --disable-shared --with-expat=/opt/local 
     126  $ ./configure --prefix=/opt/local --disable-shared --with-expat=/opt/local 
    127127  $ make && sudo make install 
    128128 
    …… 
    140140  $ svn co -r 10885 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg 
    141141  $ cd ffmpeg 
     142  $ cp common.mak subdir.mak 
    142143 
    143144Then build: 
    …… 
    173174 
    174175Launch Uploadr from Terminal to get debug windows: 
     176  $ chmod a+w MacUploadr.app/Contents/MacOS/xulrunner 
    175177  $ MacUploadr.app/Contents/MacOS/xulrunner -jsconsole 
    176178 
    …… 
    211213  $ make mac build en-US 
    212214 
    213 If you do not want to create update files (see README.updates): 
     215NOTE: These will fail at the MAR build steps, unless you have the Mozilla 
     216tools built and installed. See README.updates for this, or you can 
     217skip the MAR build step (recommended for outside developers): 
    214218  $ make mac all-build 
    215219