Attachment #122258 for bug #182249

Lines 860-866 Link Here

(-)src.orig/common.py (-1 / +1 lines)
860	# windows running from exe, return as is	860	# windows running from exe, return as is
861	return os.path.abspath(os.path.dirname(sys.executable))	861	return os.path.abspath(os.path.dirname(sys.executable))
862	# running from src, up one	862	# running from src, up one
863	return os.path.split(os.path.abspath(os.path.dirname(sys.argv[0])))[0]	863	return os.path.abspath(os.path.dirname(sys.argv[0]))
864		864
865	if sys.platform=='win32':	865	if sys.platform=='win32':
866	# From Tim Golden's Win32 How Do I ...?	866	# From Tim Golden's Win32 How Do I ...?





class ConversionFailed(Exception): pass

helperdir="/usr/bin"

osext={'win32': '.exe',
       'darwin': '.mbin',
       'linux2': ''} \
       [sys.platform]

# This shortname crap is needed because Windows programs (including ffmpeg)

    p=sys.path[0]
    if os.path.isfile(p):
        p=os.path.dirname(p)
    helpersdirectory="/usr/bin"
    print "Helper Directory: "+helpersdirectory
    if sys.platform=='win32':
        osext=".exe"
    if sys.platform=='darwin':
        osext=".mbin"
    if sys.platform=='linux2':
        osext=""
        
    pngtopnmbin=gethelperbinary('pngtopnm')
    ppmquantbin=gethelperbinary('ppmquant')

Lines 21-27 Link Here

(-)src.orig/importexport.py (-1 / +1 lines)
21	import wx.html	21	import wx.html
22		22
23	# Others	23	# Others
24	from thirdparty import DSV	24	import DSV
25		25
26	# My modules	26	# My modules
27	import common	27	import common

Lines 13-18 Link Here

(-)src.orig/native/av/bmp2avi/Makefile (-1 / +1 lines)
13		13
14	SRC=avi_file.cxx bmp_file.cxx b2a.cxx	14	SRC=avi_file.cxx bmp_file.cxx b2a.cxx
15		15
16	bmp2avi.lbin bmp2avi.mbin bmp2avi.exe: $(SRC)	16	bmp2avi bmp2avi.mbin bmp2avi.exe: $(SRC)
17	$(CXX) $(EXTRADEFINES) -O2 -o $@ $(SRC)	17	$(CXX) $(EXTRADEFINES) -O2 -o $@ $(SRC)
18		18

Lines 4-7 Link Here

(-)src.orig/native/usb/build.sh (-1 / +1 lines)
4	swig -python -I/usr/include libusb.i	4	swig -python -I/usr/include libusb.i
5		5
6	gcc -fPIC -Wall -fno-strict-aliasing -O2 -g -shared -I $INCLUDEDIR -o _libusb.so libusb_wrap.c -lusb	6	gcc -fPIC -Wall -fno-strict-aliasing -O2 -g -shared -I $INCLUDEDIR -o _libusb.so libusb_wrap.c -lusb
7	strip _libusb.so	7	#strip _libusb.so

Lines 16-22 Link Here

(-)src.orig/phones/com_samsung.py (-1 / +1 lines)
16	import time	16	import time
17		17
18	# site-packages	18	# site-packages
19	from thirdparty import DSV	19	import DSV
20		20
21	# BitPim modules	21	# BitPim modules
22	import bpcalendar	22	import bpcalendar

Return to bug 182249

Lines 20-30 Link Here

(-)src.orig/conversions.py (-4 / +4 lines)
20		20
21	class ConversionFailed(Exception): pass	21	class ConversionFailed(Exception): pass
22		22
23	helperdir=os.path.join(common.get_main_dir(), "helpers")	23	helperdir="/usr/bin"
24		24
25	osext={'win32': '.exe',	25	osext={'win32': '.exe',
26	'darwin': '.mbin',	26	'darwin': '.mbin',
27	'linux2': '.lbin'} \	27	'linux2': ''} \
28	[sys.platform]	28	[sys.platform]
29		29
30	# This shortname crap is needed because Windows programs (including ffmpeg)	30	# This shortname crap is needed because Windows programs (including ffmpeg)
Lines 128-141 Link Here
128	p=sys.path[0]	128	p=sys.path[0]
129	if os.path.isfile(p):	129	if os.path.isfile(p):
130	p=os.path.dirname(p)	130	p=os.path.dirname(p)
131	helpersdirectory=os.path.abspath(os.path.join(p, 'helpers'))	131	helpersdirectory="/usr/bin"
132	print "Helper Directory: "+helpersdirectory	132	print "Helper Directory: "+helpersdirectory
133	if sys.platform=='win32':	133	if sys.platform=='win32':
134	osext=".exe"	134	osext=".exe"
135	if sys.platform=='darwin':	135	if sys.platform=='darwin':
136	osext=".mbin"	136	osext=".mbin"
137	if sys.platform=='linux2':	137	if sys.platform=='linux2':
138	osext=".lbin"	138	osext=""
139		139
140	pngtopnmbin=gethelperbinary('pngtopnm')	140	pngtopnmbin=gethelperbinary('pngtopnm')
141	ppmquantbin=gethelperbinary('ppmquant')	141	ppmquantbin=gethelperbinary('ppmquant')