OK, I've checked into trunk. I'm going to let it sit a little a day or two before moving over to the stable branch.
but I'm wondering if we really want the version string to be an interface that has compatibility implications?
I'm not sure what compatibility implications you're referring to, but I suppose it's time to add metadata to the packages.
I've made some decent progress on implementing metadata generators. I'll submit a fresh patch once I integrate those into the build process.
GEN_SOFTWARE=$(topdir)tools/gen_meta_software$(EXE)GEN_SOFTWARE_FLAGS=--category-name PS --product-name CHDK --product-version $(BUILD_NUMBER).$(BUILD_SVNREV) --product-created `date +%Y-%m-%dT%H:%M:%SZ -u` --build-changeset $(BUILD_SVNREV) --camera-platform $(PLATFORM) --camera-revision $(PLATFORMSUB) --source-name $(VER) --compiler-name GCC --compiler-version $(GCC_VERSION)ifdef STATEGEN_SOFTWARE_FLAGS+= --build-status $(STATE)endififdef OPT_DE_VERSIONGEN_SOFTWARE_FLAGS+= --product-language deifeq ($(BUILD_NUMBER),1.5.0)GEN_SOFTWARE_FLAGS+= --source-url http://forum.chdk-treff.de/download_dev.phpelseGEN_SOFTWARE_FLAGS+= --source-url http://forum.chdk-treff.de/download.phpendifelseGEN_SOFTWARE_FLAGS+= --product-language enifeq ($(BUILD_NUMBER),1.5.0)GEN_SOFTWARE_FLAGS+= --source-url http://mighty-hoernsche.de/trunk/elseGEN_SOFTWARE_FLAGS+= --source-url http://mighty-hoernsche.de/endifendififeq ($(BUILD_NUMBER),1.5.0)GEN_SOFTWARE_FLAGS+= --source-channel trunkelseGEN_SOFTWARE_FLAGS+= --source-channel releaseendififdef NEED_ENCODED_DISKBOOTGEN_SOFTWARE_FLAGS+= --encoding-name dancingbits --encoding-version $(NEED_ENCODED_DISKBOOT)endif
Is there an elegant way of discovering the channel (trunk/release)?
For the source URL, it might be preferable to require that it be defined outside of the normal makefiles (on the make command line or localbuildconf.inc) so random user builds would not point to the official servers.
source - mapping, source distribution details (N/A in manual builds):
Quote from: dmitrys on 05 / June / 2017, 17:27:10My apologies about that patch. GCC 4.9.3 insists on putting the added string in a location that's separate from the previous three.OK, I've checked into trunk. I'm going to let it sit a little a day or two before moving over to the stable branch.
My apologies about that patch. GCC 4.9.3 insists on putting the added string in a location that's separate from the previous three.
This is now in the 1.4 branch as well (r4823)
Thanks. Any feedback on the metadata generator?