Changeset 317


Ignore:
Timestamp:
08/06/09 06:28:35 (8 years ago)
Author:
marc
Message:

Improved makefile to work with prefixes, fixed errors, improved manpag and readme, and fix a configuration error

Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/release/0.2/ChangeLog

    r309 r317  
    110.2.2: 
    22 * Fixed a fatal bug with Python 2.6/PyGTK 2.14 
    3  * Simplified and improved Makefile 
    43 * Fixed an issue with the right images showing up in notifications 
     4 * Fixed an fatal issue with starting Itaka from unexistant directories 
     5 * Vastly improved Makefile to support installation on different PREFIX 
    56 
    670.2.1:  
  • branches/release/0.2/Makefile

    r315 r317  
    66FIND ?= find 
    77 
    8 PREFIX = /usr 
     8PREFIX = /usr/local 
    99# When debian builds it, it passes its own DESTDIR 
    1010DESTDIR = $(PREFIX) 
     
    2626        # Replace images directory 
    2727        mv config.py config.py.old 
    28         sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py 
    29         mv config.py.old config.py 
     28        sed "s|/usr/local/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py 
    3029 
    3130        gzip -9 -c share/itaka.1 > share/itaka.1.gz 
     
    4847        $(INSTALL) -m 644 share/itaka.1.gz $(MANDIR) 
    4948        if test -f $(BINDIR)/itaka; then rm $(BINDIR)/itaka; fi  
     49 
     50        # Create our binary directory for the symlink 
     51        if test ! -d $(BINDIR); then mkdir $(BINDIR); fi 
    5052        ln -sf  $(LIBDIR)/itaka.py $(BINDIR)/itaka 
    51         echo $( ls $(BINDIR)/itaka ) 
     53 
     54        #echo $( ls $(BINDIR)/itaka ) 
    5255        chmod +x $(BINDIR)/itaka 
    5356         
     57        # Clean up 
     58        # Get our pre-modified config.py back 
     59        mv config.py.old config.py 
     60 
    5461uninstall: 
    5562        rm -r $(BINDIR)/itaka $(DATADIR) $(LIBDIR) $(ICONDIR)/itaka.png $(APPLICATIONSDIR)/itaka.desktop $(MANDIR)/itaka.1.gz 
    5663 
    5764clean: 
    58         find . -type f  \( -regex '.+\.py[co]' -o -name 'itaka.1.gz' \) -exec rm {} \; 
     65        find . -type f  \( -regex '.+\.py[co]' -o -name 'itaka.1.gz' \) -exec rm -f {} \; 
    5966 
    6067help: 
  • branches/release/0.2/README

    r301 r317  
    2929- GTK 2.10 or higher 
    3030 
    31 3. INSTALLATION: 
    32  
     313. INSTALLATION:  
    3332Itaka needs to be installed as the root user. 
    3433 
     
    4039Makefile will copy the files to the correct location in your system. You do not  
    4140need to configure or compile Itaka as it is written in interpreted Python code. 
     41 
     42By default itaka will be installed in /usr/local/, if you want to use another location, add PREFIX=/usr/mylocation before every make command, including unnstall. 
    4243 
    4344To uninstall, once again as root type 'make uninstall' 
  • branches/release/0.2/config.py

    r295 r317  
    5151image_dir = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), "share/images/") 
    5252#: To be changed on install to specify where the installed files actually are 
    53 prefix = "/usr/share/itaka/images" 
     53prefix = "/usr/local/share/itaka/images/" 
    5454if os.path.exists(prefix): 
    5555    image_dir = prefix 
     
    6161 
    6262#: Save path for screenshots (system-specific specified later on) 
    63 save_path = os.getcwd() 
     63try: 
     64    save_path = os.getcwd() 
     65except: 
     66    print "[*] WARNING: Could not get current directory" 
    6467 
    6568if os.environ.get('HOME'): 
  • branches/release/0.2/share/itaka.1

    r295 r317  
    2626.SH "SEE ALSO"  
    2727.PP  
    28 /usr/share/doc/itaka/README.gz 
     28README file in source or on Debian systems: /usr/share/doc/itaka/README.gz 
    2929.SH "AUTHOR"  
    3030.PP  
    3131Itaka was written by: Marc E. <santusmarc@users.sourceforge.net> 
    3232.PP  
    33 This manual page was written by Marc E. santusmarc@users.sourceforge.net for  
     33This manual page was written by Marc E. <santusmarc@users.sourceforge.net> for  
    3434the \fBDebian\fP system (but may be used by others).  Permission is  
    3535granted to copy, distribute and/or modify this document under  
  • trunk/ChangeLog

    r309 r317  
    13130.2.2: 
    1414 * Fixed a fatal bug with Python 2.6/PyGTK 2.14 
    15  * Simplified and improved Makefile 
    1615 * Fixed an issue with the right images showing up in notifications 
     16 * Fixed an fatal issue with starting Itaka from unexistant directories 
     17 * Vastly improved Makefile to support installation on different PREFIX 
    1718 
    18190.2.1: 
  • trunk/Makefile

    r315 r317  
    66FIND ?= find 
    77 
    8 PREFIX = /usr 
     8PREFIX = /usr/local 
    99# When debian builds it, it passes its own DESTDIR 
    1010DESTDIR = $(PREFIX) 
     
    2929        mv config.py config.py.old 
    3030        mv itaka.py itaka.py.old 
    31         sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py 
    32         sed -e "s|/usr/share/locale/|$(REPLACELOCALEDIR)|g" itaka.py.old > itaka.py 
    33         mv config.py.old config.py 
    34         mv itaka.py.old itaka.py 
     31        sed "s|/usr/local/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py 
     32        sed "s|/usr/share/locale/|$(REPLACELOCALEDIR)|g" itaka.py.old > itaka.py 
    3533         
    3634        $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(IMAGESDIR) $(APPLICATIONSDIR) $(ICONDIR) $(MANDIR) 
     
    5250        $(INSTALL) -m 644 share/itaka.1.gz $(MANDIR) 
    5351        if test -f $(BINDIR)/itaka; then rm $(BINDIR)/itaka; fi  
     52 
     53        # Create our binary directory for the symlink 
     54        if test ! -d $(BINDIR); then mkdir $(BINDIR); fi 
    5455        ln -sf  $(LIBDIR)/itaka.py $(BINDIR)/itaka 
    55         echo $( ls $(BINDIR)/itaka ) 
     56 
     57        #echo $( ls $(BINDIR)/itaka ) 
    5658        chmod +x $(BINDIR)/itaka 
    5759         
     
    6466        done 
    6567 
     68        # Clean up 
     69        mv config.py.old config.py 
     70        mv itaka.py.old itaka.py 
     71 
    6672uninstall: 
    6773        rm -r $(BINDIR)/itaka $(DATADIR) $(LIBDIR) $(ICONDIR)/itaka.png $(APPLICATIONSDIR)/itaka.desktop $(MANDIR)/itaka.1.gz 
    6874 
    6975clean: 
    70         find . -type f  \( -regex '.+\.py[co]' -o -name 'itaka.1.gz' \) -exec rm {} \; 
     76        find . -type f  \( -regex '.+\.py[co]' -o -name 'itaka.1.gz' \) -exec rm -f {} \; 
    7177        rm locale/*/LC_MESSAGES/*.mo 
    7278 
  • trunk/README

    r301 r317  
    3535Makefile will copy the files to the correct location in your system. You do not  
    3636need to configure or compile Itaka as it is written in interpreted Python code. 
     37 
     38By default itaka will be installed in /usr/local/, if you want to use another location, add PREFIX=/usr/mylocation before every make command, including unnstall. 
    3739 
    3840To uninstall, once again as root type 'make uninstall' 
  • trunk/config.py

    r288 r317  
    5858 
    5959#: To be changed on install to specify where the installed files actually are 
    60 image_prefix = '/usr/share/itaka/images/' 
     60image_prefix = '/usr/local/share/itaka/images/' 
    6161if os.path.exists(image_prefix): 
    6262    image_dir = image_prefix 
     
    6767 
    6868#: Save path for screenshots (system-specific specified later on) 
    69 save_path = os.getcwd() 
     69try: 
     70    save_path = os.getcwd() 
     71except: 
     72    print "[*] WARNING: Could not get current directory" 
    7073 
    7174""" Console output verbosity 
  • trunk/share/itaka.1

    r268 r317  
    2626.SH "SEE ALSO"  
    2727.PP  
    28 /usr/share/doc/itaka/README.gz 
     28README file in source or on Debian systems: /usr/share/doc/itaka/README.gz 
    2929.SH "AUTHOR"  
    3030.PP  
    3131Itaka was written by: Marc E. <santusmarc@users.sf.net> 
    3232.PP  
    33 This manual page was written by Marc E. santusmarc@users.sf.net for  
     33This manual page was written by Marc E. <santusmarc@users.sourceforge.net> for  
    3434the \fBDebian\fP system (but may be used by others).  Permission is  
    3535granted to copy, distribute and/or modify this document under  
Note: See TracChangeset for help on using the changeset viewer.