Skip to content

Conversation

@zhuyingjiang
Copy link
Contributor

we now using git tag for version number control, but if
we release the code without .git/ folder, the git tag version
number is not present, so will cause compile error.
add the .tarball-version file as the local version number file,
it still can be generated by the autogen.sh from git tag. So
everytime anyone make a git tag should still modify the
.tarball-version file.

Signed-off-by: Zhu Yingjiang yingjiang.zhu@linux.intel.com

we now using git tag for version number control, but if
we release the code without .git/ folder, the git tag version
number is not present, so will cause compile error.
add the .tarball-version file as the local version number file,
it still can be generated by the autogen.sh from git tag. So
everytime anyone make a git tag should still modify the
.tarball-version file.

Signed-off-by: Zhu Yingjiang <yingjiang.zhu@linux.intel.com>
@lgirdwood lgirdwood merged commit 0db8f3d into thesofproject:master Nov 20, 2018
@lgirdwood
Copy link
Member

@zhuyingjiang are you sure alsalib keeps .tarball-version under version control ? I cant see it today and I've just done an update. Tracking this file is also causing issues for normal git workflow since it is being modified by our scripts when we build. I'm going to revert until this is resolved.

@zhuyingjiang
Copy link
Contributor Author

alsa-lib have local version number in configure,ac as below:
AC_PREREQ(2.59)
-AC_INIT(alsa-lib, 1.1.6)
+AC_INIT(alsa-lib, 1.1.7)
and sof code defined a version.sh file here. version.sh generated a .tarball-version and .version. So if .tarball-version can't use, there should a version number defined in version.sh

@lgirdwood
Copy link
Member

@zhuyingjiang .tarball_version can be used, bu the point is that it cant be under version control (since it's frequently modified e.g. by building). See @jajanusz comments in revert discussion.

@zhuyingjiang
Copy link
Contributor Author

@lgirdwood OK, I see in the latest code "make dist" can generate the .tarball-version in the tarball, so upstream a .tarball-version it not needed, I will change the PR in the .gitignore and remove .tarball-version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants