strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ause128: #i115964# create .jnilib file on request when linking; deliver .jnilib files instead of deliver magic

Browse source
This commit is contained in:
Hans-Joachim Lankenau 2010-12-07 19:13:10 +01:00
parent 60bb740110
commit 4b125ac345
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
solenv/bin/deliver.pl
View file

@ -789,11 +789,6 @@ sub copy_if_newer
if ( $opt_delete ) {
print "REMOVE: $to\n" if $opt_verbose;
$rc = unlink($to) unless $opt_check;
# handle special packaging of *.dylib files for Mac OS X
if ( $to =~ s/\.dylib$/.jnilib/ ) {
print "REMOVE: $to\n" if $opt_verbose;
$rc += unlink "$to" unless $opt_check;
}
return 1 if $opt_check;
return $rc;
}
@ -858,19 +853,6 @@ sub copy_if_newer
# handle special packaging of *.dylib files for Mac OS X
if ( $^O eq 'darwin' )
{
if ( $to =~ /\.dylib/ ) {
system("macosx-create-bundle", $to);
my $bundlelib = $to;
$bundlelib =~ s/\.dylib$//;
$bundlelib .= ".jnilib";
if ( $opt_delete ) {
print "REMOVE: $bundlelib\n" if $opt_verbose;
unlink "$bundlelib" unless $opt_check;
} else {
push_on_ziplist($bundlelib) if $opt_zip;
push_on_loglist("LINK", basename($to), "$bundlelib") if $opt_log;
}
}
system("macosx-create-bundle", "$to=$from.app") if ( -d "$from.app" );
system("ranlib", "$to" ) if ( $to =~ /\.a/ );
}

20
solenv/inc/_tg_shl.mk
View file

@ -440,8 +440,10 @@ $(SHL1TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_1.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL1RPATH) $@
.IF "$(SHL1CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL1CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL1NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN)
@ -982,8 +984,10 @@ $(SHL2TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_2.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL2RPATH) $@
.IF "$(SHL2CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL2CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL2NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN)
@ -1524,8 +1528,10 @@ $(SHL3TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_3.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL3RPATH) $@
.IF "$(SHL3CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL3CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL3NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN)
@ -2066,8 +2072,10 @@ $(SHL4TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_4.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL4RPATH) $@
.IF "$(SHL4CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL4CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL4NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN)
@ -2608,8 +2616,10 @@ $(SHL5TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_5.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL5RPATH) $@
.IF "$(SHL5CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL5CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL5NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN)
@ -3150,8 +3160,10 @@ $(SHL6TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_6.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL6RPATH) $@
.IF "$(SHL6CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL6CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL6NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN)
@ -3692,8 +3704,10 @@ $(SHL7TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_7.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL7RPATH) $@
.IF "$(SHL7CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL7CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL7NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN)
@ -4234,8 +4248,10 @@ $(SHL8TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_8.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL8RPATH) $@
.IF "$(SHL8CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL8CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL8NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN)
@ -4776,8 +4792,10 @@ $(SHL9TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_9.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL9RPATH) $@
.IF "$(SHL9CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL9CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL9NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN)
@ -5318,8 +5336,10 @@ $(SHL10TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_10.cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL10RPATH) $@
.IF "$(SHL10CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL10CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL10NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN)

2
solenv/inc/tg_shl.mk
View file

@ -469,8 +469,10 @@ $(SHL$(TNR)TARGETN) : \
@+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
@$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
shl $(SHL$(TNR)RPATH) $@
.IF "$(SHL$(TNR)CREATEJNILIB)"!=""
@echo "Making: " $(@:f).jnilib
@macosx-create-bundle $@
.ENDIF # "$(SHL$(TNR)CREATEJNILIB)"!=""
.IF "$(UPDATER)"=="YES"
.IF "$(SHL$(TNR)NOCHECK)"==""
$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN)