Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
03604560
Kaydet (Commit)
03604560
authored
Haz 11, 2011
tarafından
Christian Lohmaier
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fix compilation with internal python on Mac
üst
7abe7b62
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
12 deletions
+7
-12
makefile.mk
pyuno/source/loader/makefile.mk
+1
-5
makefile.mk
pyuno/source/module/makefile.mk
+6
-7
No files found.
pyuno/source/loader/makefile.mk
Dosyayı görüntüle @
03604560
...
@@ -85,14 +85,10 @@ $(DLLDEST)$/%.py: %.py
...
@@ -85,14 +85,10 @@ $(DLLDEST)$/%.py: %.py
cp
$?
$@
cp
$?
$@
.ENDIF
# L10N_framework
.ENDIF
# L10N_framework
ALLTAR
:
$(MISC)/pythonloader.component
$(eq
,
$(OS)
,
MACOSX $(MISC)/installname_loader $(NULL))
ALLTAR
:
$(MISC)/pythonloader.component
$(MISC)/pythonloader.component .ERRREMOVE
:
\
$(MISC)/pythonloader.component .ERRREMOVE
:
\
$(SOLARENV)/bin/createcomponent.xslt pythonloader.component
$(SOLARENV)/bin/createcomponent.xslt pythonloader.component
$(XSLTPROC)
--nonet
--stringparam
uri
\
$(XSLTPROC)
--nonet
--stringparam
uri
\
'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)'
-o
$@
\
'vnd.sun.star.expand:$$OOO_BASE_DIR/program/$(SHL1TARGETN:f)'
-o
$@
\
$(SOLARENV)/bin/createcomponent.xslt
pythonloader.component
$(SOLARENV)/bin/createcomponent.xslt
pythonloader.component
$(MISC)/installname_loader
:
$(LB)/$(TARGET)$(DLLPOST)
install_name_tool
-change
$(PYTHON_MAKEINSTALLDIR)
/OOoPython.framework/Versions/
$(PYMAJOR)
.
$(PYMINOR)
/OOoPython @loader_path/OOoPython.framework/Versions/
$(PYMAJOR)
.
$(PYMINOR)
/OOoPython
$<
touch
$@
pyuno/source/module/makefile.mk
Dosyayı görüntüle @
03604560
...
@@ -90,7 +90,7 @@ SHL1STDLIBS= \
...
@@ -90,7 +90,7 @@ SHL1STDLIBS= \
$(PYTHONLIB)
\
$(PYTHONLIB)
\
$(EXTRA_FRAMEWORK_FLAG)
$(EXTRA_FRAMEWORK_FLAG)
SHL1DEPN
=
SHL1DEPN
=
$
(
eq,
$(OS)
,MACOSX
$(MISC)
/framework_link
$(NULL)
)
SHL1LIBS
=
$(SLB)$/$(TARGET)
.lib
SHL1LIBS
=
$(SLB)$/$(TARGET)
.lib
SHL1IMPLIB
=
i
$(TARGET)
SHL1IMPLIB
=
i
$(TARGET)
...
@@ -121,7 +121,7 @@ $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
...
@@ -121,7 +121,7 @@ $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
targetdll
=
$(LB)$/$(TARGET)$(DLLPOST)
targetdll
=
$(LB)$/$(TARGET)$(DLLPOST)
.ENDIF
.ENDIF
ALLTAR
:
$(eq
,
$(OS)
,
MACOSX $(MISC)/installname_module $(NULL))
\
ALLTAR
:
\
$(DLLDEST)$/uno.py
\
$(DLLDEST)$/uno.py
\
$(DLLDEST)$/unohelper.py
\
$(DLLDEST)$/unohelper.py
\
$(targetdll)
\
$(targetdll)
\
...
@@ -134,11 +134,10 @@ ALLTAR : $(eq,$(OS),MACOSX $(MISC)/installname_module $(NULL)) \
...
@@ -134,11 +134,10 @@ ALLTAR : $(eq,$(OS),MACOSX $(MISC)/installname_module $(NULL)) \
$(DLLDEST)$/%.py
:
%.py
$(DLLDEST)$/%.py
:
%.py
cp
$?
$@
cp
$?
$@
$(MISC)/installname_module
:
$(LB)/$(DLLPRE)$(TARGET)$(DLLPOST)
# make checkdll happy
install_name_tool
-change
$(PYTHON_MAKEINSTALLDIR)
/OOoPython.framework/Versions/
$(PYMAJOR)
.
$(PYMINOR)
/OOoPython @loader_path/OOoPython.framework/Versions/
$(PYMAJOR)
.
$(PYMINOR)
/OOoPython
$<
$(MISC)/framework_link
:
# hack to make checkdll happy
$(COMMAND_ECHO)
ln
-sf
$(SOLARLIBDIR)
/OOoPython.framework
$(LB)
/OOoPython.framework
ln
-sf
$(SOLARLIBDIR)
/OOoPython.framework
$(LB)
/OOoPython.framework
@
touch
$@
touch
$@
$(MISC)$/$(PYUNORC)
:
pyuno
$(MISC)$/$(PYUNORC)
:
pyuno
-rm
-f
$@
-rm
-f
$@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment