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
43b987e4
Kaydet (Commit)
43b987e4
authored
Ock 19, 2012
tarafından
Norbert Thiebaud
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
replace SOLARSRC by SRC_ROOT and get rid of SOLARDEFIMG uses
üst
628ee842
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
64 additions
and
69 deletions
+64
-69
config_host.mk.in
config_host.mk.in
+1
-0
makefile.mk
connectivity/source/drivers/hsqldb/makefile.mk
+2
-2
makefile.mk
mysqlc/source/makefile.mk
+1
-1
makefile.mk
packimages/pack/makefile.mk
+5
-5
makefile.mk
reportbuilder/util/makefile.mk
+1
-1
makefile.mk
scp2/macros/makefile.mk
+1
-1
makefile.mk
sdext/source/minimizer/makefile.mk
+2
-2
makefile.mk
sdext/source/pdfimport/makefile.mk
+1
-1
makefile.mk
sdext/source/presenter/makefile.mk
+1
-1
set_soenv.in
set_soenv.in
+0
-6
Global.xml
smoketest/data/Global.xml
+2
-2
Test_10er.xml
smoketest/data/Test_10er.xml
+1
-1
build.pl
solenv/bin/build.pl
+1
-1
_tg_rslb.mk
solenv/inc/_tg_rslb.mk
+40
-40
installationtest.mk
solenv/inc/installationtest.mk
+1
-1
tg_rslb.mk
solenv/inc/tg_rslb.mk
+4
-4
No files found.
config_host.mk.in
Dosyayı görüntüle @
43b987e4
...
...
@@ -311,6 +311,7 @@ export SIZEOF_POINTER="@SIZEOF_POINTER@"
export SIZEOF_SHORT="@SIZEOF_SHORT@"
export SPLIT_APP_MODULES="@SPLIT_APP_MODULES@"
export SPLIT_OPT_FEATURES="@SPLIT_OPT_FEATURES@"
export SRCDIR="@SRC_ROOT@"
export STARTCENTER_LEFT_BITMAP="@STARTCENTER_LEFT_BITMAP@"
export STARTCENTER_RIGHT_BITMAP="@STARTCENTER_RIGHT_BITMAP@"
export STARTCENTER_RTL_LEFT_BITMAP="@STARTCENTER_RTL_LEFT_BITMAP@"
...
...
connectivity/source/drivers/hsqldb/makefile.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -51,12 +51,12 @@ CDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
SRS1NAME
=
$(TARGET)
SRC1FILES
=
\
hsqlui.src
RES1FILELIST
=
\
$(SRS)$/$(TARGET)
.srs
RESLIB1NAME
=
$(TARGET)
RESLIB1IMAGES
=
$(S
OLARDEFIMG)$
/
database
RESLIB1IMAGES
=
$(S
RC_ROOT)
/
$(RSCDEFIMG)
/database
RESLIB1SRSFILES
=
$(RES1FILELIST)
# Note that the resource file built here is currently *not* included
...
...
mysqlc/source/makefile.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -220,7 +220,7 @@ EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE)
.INCLUDE
:
target.mk
.INCLUDE
:
extension_post.mk
$(COMPONENT_IMAGES)
:
$(S
OLARSRC)$
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
$(COMPONENT_IMAGES)
:
$(S
RC_ROOT)
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@
:
d)
$(COPY)
$<
$@
...
...
packimages/pack/makefile.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -40,8 +40,8 @@ SORTED_LIST=$(RES)$/img$/sorted.lst
# (Tango fallbacks to Industrial for the missing icons)
CUSTOM_IMAGE_SETS
=
$(WITH_THEMES)
CUSTOM_IMAGES
+=
$
(
foreach,i,
$(CUSTOM_IMAGE_SETS)
images_
$i
)
CUSTOM_PREFERRED_FALLBACK_1*=-c
$(S
OLARSRC)$
/icon-themes$/tango
CUSTOM_PREFERRED_FALLBACK_2*=-c
$(S
OLARSRC)$
/icon-themes$/industrial
CUSTOM_PREFERRED_FALLBACK_1*=-c
$(S
RC_ROOT)
/icon-themes$/tango
CUSTOM_PREFERRED_FALLBACK_2*=-c
$(S
RC_ROOT)
/icon-themes$/industrial
ALLTAR
:
$(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
...
...
@@ -54,14 +54,14 @@ $(SORTED_LIST) : image-sort.lst
$(RES)$/img$/commandimagelist.ilst .PHONY
:
$(SORTED_LIST)
@@-$(MKDIR)
$(RES)$/img
#+-$(RM) $@ $@.$(INPATH)
$(FIND)
$(S
OLARSRC)$/$(RSCDEFIMG)/cmd
-name
"*.png"
|
sed
"s#$(SOLARSRC)$
/$(RSCDEFIMG)#%MODULE%#"
|
$(PERL)
$(SOLARENV)$/bin$/sort.pl
>
$@.$(INPATH)
$(FIND)
$(S
RC_ROOT)/$(RSCDEFIMG)/cmd
-name
"*.png"
|
sed
"s#$(SRC_ROOT)
/$(RSCDEFIMG)#%MODULE%#"
|
$(PERL)
$(SOLARENV)$/bin$/sort.pl
>
$@.$(INPATH)
$(PERL)
$(SOLARENV)$/bin$/diffmv.pl
$@.$(INPATH)
$@
$(COMMONBIN)$/images.zip .PHONY
:
$(RES)$/img$/commandimagelist.ilst
$(PERL)
$(SOLARENV)$/bin$/packimages.pl
-g
$(S
OLARSRC)$/$(RSCDEFIMG)
-m
$(SOLARSRC)$
/$(RSCDEFIMG)
-c
$(RSCCUSTOMIMG)
-l
$(SOLARCOMMONRESDIR)$/img
-s
$(SORTED_LIST)
-l
$(RES)$/img
-o
$@
$(PERL)
$(SOLARENV)$/bin$/packimages.pl
-g
$(S
RC_ROOT)/$(RSCDEFIMG)
-m
$(SRC_ROOT)
/$(RSCDEFIMG)
-c
$(RSCCUSTOMIMG)
-l
$(SOLARCOMMONRESDIR)$/img
-s
$(SORTED_LIST)
-l
$(RES)$/img
-o
$@
images_%
:
$(RES)$/img$/commandimagelist.ilst
$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(S
OLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$
/icon-themes$/$(@
:
s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(S
RC_ROOT)/$(RSCDEFIMG) -m $(SRC_ROOT)/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SRC_ROOT)
/icon-themes$/$(@
:
s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
# make sure to have one to keep packing happy
$(COMMONBIN)$/images_brand.zip
:
...
...
reportbuilder/util/makefile.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -134,7 +134,7 @@ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
@@-$(MKDIRHIER) $(@
:
d)
$(COPY)
$<
$@
$(COMPONENT_IMAGES)
:
$(S
OLARSRC)$
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
$(COMPONENT_IMAGES)
:
$(S
RC_ROOT)
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@
:
d)
$(COPY)
$<
$@
...
...
scp2/macros/makefile.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -45,4 +45,4 @@ ALLTAR : $(INCCOM)$/langmacros.inc
.PHONY $(INCCOM)$/langmacros.inc
:
@echo
------------------------------
@echo Making
:
$@
$(COMMAND_ECHO)$(PERL)
macro.pl
$(VERBOSITY)
-o
$@
-c
$(S
OLARSRC
)/set_soenv.stamp
$(COMMAND_ECHO)$(PERL)
macro.pl
$(VERBOSITY)
-o
$@
-c
$(S
RC_ROOT
)/set_soenv.stamp
sdext/source/minimizer/makefile.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -130,11 +130,11 @@ ZIP2LIST= \
.IF
"$(L10N_framework)"
==
""
.INCLUDE
:
extension_post.mk
$(COMPONENT_BITMAPS)
:
$(S
OLARSRC)$
/$(RSCDEFIMG)$/minimizer$/$$(@:f)
$(COMPONENT_BITMAPS)
:
$(S
RC_ROOT)
/$(RSCDEFIMG)$/minimizer$/$$(@:f)
@@-$(MKDIRHIER) $(@
:
d)
$(COPY)
$<
$@
$(COMPONENT_IMAGES)
:
$(S
OLARSRC)$
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
$(COMPONENT_IMAGES)
:
$(S
RC_ROOT)
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@
:
d)
$(COPY)
$<
$@
...
...
sdext/source/pdfimport/makefile.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -165,7 +165,7 @@ $(MISC)/descriptions : $(DESCRIPTION)
.ENDIF
$(TOUCH)
$@
$(COMPONENT_IMAGES)
:
$(S
OLARSRC)$
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
$(COMPONENT_IMAGES)
:
$(S
RC_ROOT)
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@
:
d)
$(COPY)
$<
$@
.ENDIF
# L10N_framework
...
...
sdext/source/presenter/makefile.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -306,7 +306,7 @@ $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
@-$(MKDIRHIER) $(@
:
d)
+$(COPY)
$<
$@
$(COMPONENT_IMAGES)
:
$(S
OLARSRC)$
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
$(COMPONENT_IMAGES)
:
$(S
RC_ROOT)
/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@
:
d)
$(COPY)
$<
$@
...
...
set_soenv.in
Dosyayı görüntüle @
43b987e4
...
...
@@ -259,8 +259,6 @@ $PERL_PATH = dirname('@PERL@'); # Perl Path
$XLIB
=
PathFormat
(
'@XLIB@'
);
# X11 libraries
$XINC
=
PathFormat
(
'@XINC@'
);
# X11 includes
# Location of the source.
$SOLARSRC
=
'$SRC_ROOT'
;
# default TARFILE_LOCATION
if
(
'@TARFILE_LOCATION@'
eq
"DEFAULT"
)
...
...
@@ -279,7 +277,6 @@ $SOLARVERSION = '$SOLARVER';
$WORKDIR
=
'$SRC_ROOT/workdir/$INPATH'
;
$OUTDIR
=
'$SOLARVER/$INPATH'
;
#Some directories that are symlinks under rawbuild, have to use realpath on Cygwin
$SOLARDEFIMG
=
PathFormat
(
$SRC_ROOT
.
$DEFIMGS
);
$SOLARENVINC
=
'$SOLARENV'
.
$INC
;
...
...
@@ -779,7 +776,6 @@ ToFile( "SOLARVERSION", $SOLARVERSION, "e" );
ToFile
(
"WORKDIR"
,
$WORKDIR
,
"e"
);
ToFile
(
"OUTDIR"
,
$OUTDIR
,
"e"
);
ToFile
(
"SOLARENV"
,
$SOLARENV
,
"e"
);
ToFile
(
"SOLARDEFIMG"
,
$SOLARDEFIMG
,
"e"
);
ToFile
(
"SOLARENVINC"
,
$SOLARENVINC
,
"e"
);
ToFile
(
"DMAKEROOT"
,
$DMAKEROOT
,
"e"
);
if
(
$JDK
ne
"gcj"
)
{
...
...
@@ -864,8 +860,6 @@ if ($platform !~ m/cygwin/) {
ToFile
(
"TMPDIR"
,
"$ENV{'TMPDIR'}"
,
"e"
);
}
}
ToFile
(
"SOLARSRC"
,
$SOLARSRC
,
"e"
);
ToFile
(
"SRCDIR"
,
$SOLARSRC
,
"e"
);
if
(
$platform
=~
m/cygwin/
)
{
...
...
smoketest/data/Global.xml
Dosyayı görüntüle @
43b987e4
...
...
@@ -120,8 +120,8 @@ Dim gDlgState as Integer
Sub SetGlobalDoc
gOutputDoc = ThisComponent
REM need to have the binfilter component, and S
OLARSRC
set to find sample docs
if Environ(
"
S
OLARSRC
"
)
<>
""
then
REM need to have the binfilter component, and S
RC_ROOT
set to find sample docs
if Environ(
"
S
RC_ROOT
"
)
<>
""
then
oBinFilterComp = createUnoService(
"
com.sun.star.comp.office.BF_MigrateFilter
"
)
End If
end Sub
...
...
smoketest/data/Test_10er.xml
Dosyayı görüntüle @
43b987e4
...
...
@@ -395,7 +395,7 @@ Sub MakeDocTest
gCurrentTestCase = cDocOpen50
if bMakeOpen50Test and IsFilterAvailable (gCurrentDocTest or cFlt50) then
SOLARSRC = ConvertToURL(Environ(
"
S
OLARSRC
"
))
SOLARSRC = ConvertToURL(Environ(
"
S
RC_ROOT
"
))
sFileName50 = SOLARSRC+
"
/qadevOOo/testdocs/ttt.
"
+GetDocEndings(gCurrentDocTest or cFlt50)
oDoc = LoadDoc (sFileName50)
...
...
solenv/bin/build.pl
Dosyayı görüntüle @
43b987e4
...
...
@@ -1335,7 +1335,7 @@ sub usage {
print
STDERR
" --help - print help info\n"
;
print
STDERR
" --ignore - force tool to ignore errors\n"
;
print
STDERR
" --html - generate html page with build status\n"
;
print
STDERR
" file named $ENV{INPATH}.build.html will be generated in $ENV{S
OLARSRC
}\n"
;
print
STDERR
" file named $ENV{INPATH}.build.html will be generated in $ENV{S
RC_ROOT
}\n"
;
print
STDERR
" --html_path - set html page path\n"
;
print
STDERR
" --stoponerror - stop build when error occurs (for mp builds)\n"
;
print
STDERR
" --interactive - start interactive build process (process can be managed via html page)\n"
;
...
...
solenv/inc/_tg_rslb.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -12,11 +12,11 @@ $(RSC_MULTI1) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB1NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB1IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC1HEADER) $(RESLIB1SRSFILES) \
...
...
@@ -48,11 +48,11 @@ $(RSC_MULTI2) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB2NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB2IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC2HEADER) $(RESLIB2SRSFILES) \
...
...
@@ -84,11 +84,11 @@ $(RSC_MULTI3) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB3NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB3IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC3HEADER) $(RESLIB3SRSFILES) \
...
...
@@ -120,11 +120,11 @@ $(RSC_MULTI4) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB4NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB4IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC4HEADER) $(RESLIB4SRSFILES) \
...
...
@@ -156,11 +156,11 @@ $(RSC_MULTI5) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB5NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB5IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC5HEADER) $(RESLIB5SRSFILES) \
...
...
@@ -192,11 +192,11 @@ $(RSC_MULTI6) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB6NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB6IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC6HEADER) $(RESLIB6SRSFILES) \
...
...
@@ -228,11 +228,11 @@ $(RSC_MULTI7) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB7NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB7IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC7HEADER) $(RESLIB7SRSFILES) \
...
...
@@ -264,11 +264,11 @@ $(RSC_MULTI8) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB8NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB8IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC8HEADER) $(RESLIB8SRSFILES) \
...
...
@@ -300,11 +300,11 @@ $(RSC_MULTI9) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB9NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB9IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC9HEADER) $(RESLIB9SRSFILES) \
...
...
@@ -336,11 +336,11 @@ $(RSC_MULTI10) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB10NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB10IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC10HEADER) $(RESLIB10SRSFILES) \
...
...
solenv/inc/installationtest.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -55,7 +55,7 @@ my_instsets = $(shell ls -dt \
installationtest_instset = $(my_instsets:1)
.ELSE
installationtest_instset = \
$(S
OLARSRC
)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
$(S
RC_ROOT
)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
.END
.IF "$(OS)" == "WNT" && "$(CROSS_COMPILING)" != "YES"
...
...
solenv/inc/tg_rslb.mk
Dosyayı görüntüle @
43b987e4
...
...
@@ -40,11 +40,11 @@ $(RSC_MULTI$(TNR)) : \
$(foreach,i,$(alllangiso) -lg$i \
$(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
-fs={$(BIN)/$(RESLIB$(TNR)NAME)$i.res} \
$(foreach,j,$(subst,$(PRJ),$(S
OLAR
DEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
$(foreach,j,$(subst,$(PRJ),$(S
RC_ROOT)/$(RSC
DEFIMG)/$(PRJNAME) $(RESLIB$(TNR)IMAGES)) -lip={$j}/$i \
-lip={$j} ) \
-lip=$(S
OLARDEFIMG)/res/$i -lip=$(SOLAR
DEFIMG)/res ) \
-subMODULE=$(S
OLAR
DEFIMG) \
-subGLOBALRES=$(S
OLAR
DEFIMG)/res \
-lip=$(S
RC_ROOT)/$(RSCDEFIMG)/res/$i -lip=$(SRC_ROOT)/$(RSC
DEFIMG)/res ) \
-subMODULE=$(S
RC_ROOT)/$(RSC
DEFIMG) \
-subGLOBALRES=$(S
RC_ROOT)/$(RSC
DEFIMG)/res \
-oil=$(BIN) \
-ft=$@ \
$(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
...
...
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