Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8326
Modified Files:
freevo
Added Files:
Makefile
Log Message:
better build handling
Index: freevo
===================================================================
RCS file: /cvsroot/freevo/freevo/freevo,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** freevo 29 Aug 2004 18:37:05 -0000 1.117
--- freevo 15 Sep 2004 21:07:02 -0000 1.118
***************
*** 12,15 ****
--- 12,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.118 2004/09/15 21:07:02 dischi
+ # better build handling
+ #
# Revision 1.117 2004/08/29 18:37:05 dischi
# epeg support for fast jpg thumbnailing
***************
*** 294,299 ****
#
dname = os.path.dirname(freevo_script)
! freevo_python = os.path.join(dname, 'src')
! freevo_helpers = os.path.join(dname, 'src/helpers')
freevo_locale = os.path.join(dname, 'i18n')
freevo_share = os.path.join(dname, 'share')
--- 297,302 ----
#
dname = os.path.dirname(freevo_script)
! freevo_python = os.path.join(dname, 'site-packages/freevo')
! freevo_helpers = os.path.join(dname, 'site-packages/freevo/helpers')
freevo_locale = os.path.join(dname, 'i18n')
freevo_share = os.path.join(dname, 'share')
***************
*** 301,304 ****
--- 304,313 ----
freevo_config = os.path.join(dname, 'freevo_config.py')
+ # extend PYTHONPATH to internal site-packages
+ if os.environ.has_key('PYTHONPATH'):
+ os.environ['PYTHONPATH'] = '%s/site-packages:%s' % (dname,
os.environ['PYTHONPATH'])
+ else:
+ os.environ['PYTHONPATH'] = freevo_python
+
if os.path.isfile(os.path.join(dname, 'runtime/runapp')):
#
***************
*** 348,357 ****
-
- # add the variables from above into environ so Freevo can use them, too
- for var in ('freevo_script', 'runapp', 'freevo_python', 'freevo_locale',
- 'freevo_share', 'freevo_contrib', 'freevo_config', 'freevo_helpers'):
- os.environ[var.upper()] = eval(var)
-
# extend PYTHONPATH to freevo
if os.environ.has_key('PYTHONPATH'):
--- 357,360 ----
***************
*** 360,368 ****
os.environ['PYTHONPATH'] = freevo_python
! # FIXME: add lib, mevas imlib2 path (FIXME)
! os.environ['PYTHONPATH'] = '%s/../lib:%s' % (freevo_python, os.environ['PYTHONPATH'])
! os.environ['PYTHONPATH'] = '%s/../lib/mevas:%s' % (freevo_python,
os.environ['PYTHONPATH'])
! os.environ['PYTHONPATH'] = '%s/../lib/pyimlib2:%s' % (freevo_python,
os.environ['PYTHONPATH'])
! os.environ['PYTHONPATH'] = '%s/../lib/pyepeg:%s' % (freevo_python,
os.environ['PYTHONPATH'])
# extend PATH to make sure the basics are there
--- 363,371 ----
os.environ['PYTHONPATH'] = freevo_python
!
! # add the variables from above into environ so Freevo can use them, too
! for var in ('freevo_script', 'runapp', 'freevo_python', 'freevo_locale',
! 'freevo_share', 'freevo_contrib', 'freevo_config', 'freevo_helpers'):
! os.environ[var.upper()] = eval(var)
# extend PATH to make sure the basics are there
--- NEW FILE: Makefile ---
all: site-packages/_Imlib2module.so links
links:
test -e site-packages || mkdir site-packages
- rm -f site-packages/mmpython site-packages/epeg.so 2>/dev/null
-(test -e lib/mmpython && ln -sf ../lib/mmpython site-packages)
-(test -e lib/pyepeg/epeg.so && ln -sf ../lib/pyepeg/epeg.so site-packages)
ln -sf ../lib/mevas/mevas ../lib/pyepg site-packages
ln -sf ../src site-packages/freevo
lib/pyimlib2/_Imlib2module.so:
(cd lib/pyimlib2 ; make )
site-packages/_Imlib2module.so: lib/pyimlib2/_Imlib2module.so
test -e site-packages || mkdir site-packages
ln -sf ../lib/pyimlib2/_Imlib2module.so site-packages/_Imlib2module.so
ln -sf ../lib/pyimlib2/Imlib2.py site-packages/Imlib2.py
clean:
(cd lib/pyimlib2 ; make clean)
(cd lib/pyepeg ; make clean)
rm -f site-packages/*
-------------------------------------------------------
This SF.Net email is sponsored by: thawte's Crypto Challenge Vl
Crack the code and win a Sony DCRHC40 MiniDV Digital Handycam
Camcorder. More prizes in the weekly Lunch Hour Challenge.
Sign up NOW http://ad.doubleclick.net/clk;10740251;10262165;m
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
