Author: zooey Date: 2010-02-01 00:41:44 +0100 (Mon, 01 Feb 2010) New Revision: 35370 Changeset: http://dev.haiku-os.org/changeset/35370/haiku Modified: haiku/trunk/build/jam/ImageRules haiku/trunk/build/jam/MainBuildRules haiku/trunk/build/jam/OptionalPackages haiku/trunk/src/libs/png/Jamfile haiku/trunk/src/libs/zlib/Jamfile Log: * reverted the part of r35362 that introduced support for minor ABI versioning - my evil twin made me do that! Modified: haiku/trunk/build/jam/ImageRules =================================================================== --- haiku/trunk/build/jam/ImageRules 2010-01-31 22:13:51 UTC (rev 35369) +++ haiku/trunk/build/jam/ImageRules 2010-01-31 23:41:44 UTC (rev 35370) @@ -1136,24 +1136,13 @@ local lib ; for lib in $(libs) { - local abiMajor = [ on $(lib) return $(HAIKU_LIB_ABI_MAJOR) ] ; - if $(abiMajor) { - local abiMajorLib = $(lib).$(abiMajor) ; - local abiMinor = [ on $(lib) return $(HAIKU_LIB_ABI_MINOR) ] ; - if $(abiMinor) { - local abiMinorLib = $(abiMajorLib).$(abiMinor) ; - AddFilesToHaikuHybridImage $(directory) - : $(lib) : $(abiMinorLib) : true ; - AddSymlinkToHaikuHybridImage $(directory) - : $(abiMinorLib) : $(abiMajorLib) : : true ; - AddSymlinkToHaikuHybridImage $(directory) - : $(abiMinorLib) : $(lib) : : true ; - } else { - AddFilesToHaikuHybridImage $(directory) - : $(lib) : $(abiMajorLib) : true ; - AddSymlinkToHaikuHybridImage $(directory) - : $(abiMajorLib) : $(lib) : : true ; - } + local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ; + if $(abiVersion) { + local abiVersionedLib = $(lib).$(abiVersion) ; + AddFilesToHaikuHybridImage $(directory) + : $(lib) : $(abiVersionedLib) : true ; + AddSymlinkToHaikuHybridImage $(directory) + : $(abiVersionedLib) : $(lib) : : true ; } else { AddFilesToHaikuHybridImage $(directory) : $(lib) : : true ; } Modified: haiku/trunk/build/jam/MainBuildRules =================================================================== --- haiku/trunk/build/jam/MainBuildRules 2010-01-31 22:13:51 UTC (rev 35369) +++ haiku/trunk/build/jam/MainBuildRules 2010-01-31 23:41:44 UTC (rev 35370) @@ -424,24 +424,20 @@ rule SharedLibrary { - # SharedLibrary <lib> : <sources> : <libraries> : <abiMajor> : <abiMinor>; + # SharedLibrary <lib> : <sources> : <libraries> : <abiVersion> ; local lib = $(1) ; local sources = [ FGristFiles $(2) ] ; local objects = $(sources:S=$(SUFOBJ)) ; local libs = $(3) ; - local abiMajor = $(4) ; # major ABI (soname) version for lib (if any) - local abiMinor = $(5) ; # additional minor suffix (optional) + local abiVersion = $(4) ; # major ABI (soname) version for lib (if any) if ! [ IsPlatformSupportedForTarget $(1) ] { return ; } - if $(abiMajor) { - HAIKU_SONAME on $(lib) = $(lib:BS).$(abiMajor) ; - HAIKU_LIB_ABI_MAJOR on $(lib) = $(abiMajor) ; - if $(abiMinor) { - HAIKU_LIB_ABI_MINOR on $(lib) = $(abiMinor) ; - } + if $(abiVersion) { + HAIKU_SONAME on $(lib) = $(lib:BS).$(abiVersion) ; + HAIKU_LIB_ABI_VERSION on $(lib) = $(abiVersion) ; } InheritPlatform $(objects) : $(lib) ; Modified: haiku/trunk/build/jam/OptionalPackages =================================================================== --- haiku/trunk/build/jam/OptionalPackages 2010-01-31 22:13:51 UTC (rev 35369) +++ haiku/trunk/build/jam/OptionalPackages 2010-01-31 23:41:44 UTC (rev 35370) @@ -403,17 +403,11 @@ for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES) $(developmentLibs) { AddSymlinkToHaikuHybridImage $(abiDirTokens) lib : /system/lib $(lib:BS) : : true ; - local abiMajor = [ on $(lib) return $(HAIKU_LIB_ABI_MAJOR) ] ; - local abiMajorLib = $(lib:BS).$(abiMajor) ; - if $(abiMajor) { - local abiMinor = [ on $(lib) return $(HAIKU_LIB_ABI_MINOR) ] ; - if $(abiMinor) { - local abiMinorLib = $(abiMinorLib).$(abiMinor) ; - AddSymlinkToHaikuHybridImage $(abiDirTokens) lib - : /system/lib $(abiMinorLib) : : true ; - } + local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ; + if $(abiVersion) { + local abiVersionedLib = $(lib:BS).$(abiVersion) ; AddSymlinkToHaikuHybridImage $(abiDirTokens) lib - : /system/lib $(abiMajorLib) : : true ; + : /system/lib $(abiVersionedLib) : : true ; } } Modified: haiku/trunk/src/libs/png/Jamfile =================================================================== --- haiku/trunk/src/libs/png/Jamfile 2010-01-31 22:13:51 UTC (rev 35369) +++ haiku/trunk/src/libs/png/Jamfile 2010-01-31 23:41:44 UTC (rev 35370) @@ -27,6 +27,6 @@ Objects $(shared_files) ; -SharedLibrary libpng.so : [ FGristFiles $(shared_files:S=.o) ] : z : 1.2 : ; +SharedLibrary libpng.so : [ FGristFiles $(shared_files:S=.o) ] : z : 1.2 ; StaticLibrary libpng.a : [ FGristFiles $(shared_files:S=.o) ] ; Modified: haiku/trunk/src/libs/zlib/Jamfile =================================================================== --- haiku/trunk/src/libs/zlib/Jamfile 2010-01-31 22:13:51 UTC (rev 35369) +++ haiku/trunk/src/libs/zlib/Jamfile 2010-01-31 23:41:44 UTC (rev 35370) @@ -21,7 +21,7 @@ Objects $(shared_files) ; -SharedLibrary libz.so : [ FGristFiles $(shared_files:S=.o) ] : : 1 : 2 ; +SharedLibrary libz.so : [ FGristFiles $(shared_files:S=.o) ] : : 1 ; StaticLibrary libz.a : [ FGristFiles $(shared_files:S=.o) ] ;