diff --git a/doc/Build.txt b/doc/Build.txt index 7b6ca254e3783a8d921f23b7715cdc55c9923eaf..3debaf24267515b51f802d70022e902fae40a7a0 100644 --- a/doc/Build.txt +++ b/doc/Build.txt @@ -57,15 +57,18 @@ sudo make install sflphone-qt ~~~~~~~~~~~ -`sflphone-qt` gets built with sflphoned, for now. +`sflphone-qt` is *deprecated* and should not be built anymore. sflphone-gtk ~~~~~~~~~~~~ -Merging of `sflphone-gtk` to come. +Compile `sflphone-gtk` by running: ------------------------- +cd sflphone-gtk gnome-autogen.sh ./configure --prefix=/usr -------------------------- \ No newline at end of file +make +sudo make install +------------------------- diff --git a/doc/Downloads.txt b/doc/Downloads.txt index bfd28236f976f43570e0ab9e51f5b06694567f52..1446e013bf6a0c406469e7281e52bec1c88651e8 100644 --- a/doc/Downloads.txt +++ b/doc/Downloads.txt @@ -8,13 +8,20 @@ Downloads Latest release: [grid="all"] -`----------------------`---------`------------------------- -Package Type Link ------------------------------------------------------------ -*SFLphone 0.7.2* Sources http://www.sflphone.org/releases/sflphone-0.7.2.tar.gz[Download] sflink:Build.txt[Build notes] - FC6-RPM http://www.sflphone.org/releases/packages/rpm-fc6/sflphone-0.7.2-1.i386.rpm[Download] - RC6-SRPM http://www.sflphone.org/releases/packages/rpm-fc6/devel/sflphone-0.7.2-1.src.rpm[Download] -*SFLphone 0.7.0* Source http://www.sflphone.org/releases/sflphone-0.7.0.tar.gz[Download] - FC4-RPM http://www.sflphone.org/releases/packages/rpm-fc4/sflphone-0.7.0-1.i386.rpm[Download] - FC4-SRPM http://www.sflphone.org/releases/packages/rpm-fc4/devel/sflphone-0.7.0-1.src.rpm[Download] ------------------------------------------------------------ +`--------------------`----------`--------------------------- +Package Type Link +------------------------------------------------------------ +*SFLphone 0.7.2* Sources http://www.sflphone.org/releases/sflphone-0.7.2.tar.gz[Download] sflfile:Build.txt[Build notes] + FC6-RPM http://www.sflphone.org/releases/packages/rpm-fc6/sflphone-0.7.2-1.i386.rpm[Download] + RC6-SRPM http://www.sflphone.org/releases/packages/rpm-fc6/devel/sflphone-0.7.2-1.src.rpm[Download] +*SFLphone 0.7.0* Source http://www.sflphone.org/releases/sflphone-0.7.0.tar.gz[Download] + FC4-RPM http://www.sflphone.org/releases/packages/rpm-fc4/sflphone-0.7.0-1.i386.rpm[Download] + FC4-SRPM http://www.sflphone.org/releases/packages/rpm-fc4/devel/sflphone-0.7.0-1.src.rpm[Download] +------------------------------------------------------------ + + +Latest source code +------------------ + +See the sflfile:Git_Access.txt[repository access] page for the latest source +code. diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index fe3c68efcf869f252e90edd8ff8997a4531f47d8..f61b09cd991dbb033c7b6aad00f7ae56edb79ffc 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -16,8 +16,8 @@ # ifdef::backend-xhtml11[] -[sflink-inlinemacro] -<a href="index.php?f={target}.txt">{0?{0}}{0!{target}}</a> +[sflfile-inlinemacro] +<a href="index.php?file={target}">{0?{0}}{0!{target}}</a> [sflsite-inlinemacro] <a href="index.php?mod={target}">{0?{0}}{0!{target}}</a> diff --git a/www/sflphone.funcs.php b/www/sflphone.funcs.php index 48c02816f998d2dba810894924753cacc0d2f2b9..026125334e7a3ec94a00ff63aafb3dea492904fb 100644 --- a/www/sflphone.funcs.php +++ b/www/sflphone.funcs.php @@ -224,15 +224,24 @@ function get_git_hash_content($hash) { * * Used for comparison of cached/to cache/cache filename. * - * @param string Filename without the $PREFIX (ex: Features.txt, images/pouet.png) + * @param string Filename without the $PREFIX (ex: Features.txt, + * images/pouet.png) and optionally, a ":" separator, followed by + * a git tree-ish (commit, branch, tag), ex: Build.txt:tags/0.7.2 * @return string SHA-1 hash */ function get_git_hash($file) { global $USE_BRANCH, $GIT_REPOS; + $branch = $USE_BRANCH; + + $split = explode(":", $file); + if (count($split) > 1) { + $branch = $split[1]; + } + $output = array(); - $cmd = "cd $GIT_REPOS; git-ls-tree $USE_BRANCH \"".git_filename($file)."\""; + $cmd = "cd $GIT_REPOS; git-ls-tree $branch \"".git_filename($file)."\""; $string = exec($cmd, $output);