Title: [295523] trunk/Tools
- Revision
- 295523
- Author
- commit-qu...@webkit.org
- Date
- 2022-06-14 09:19:43 -0700 (Tue, 14 Jun 2022)
Log Message
[BuildStream] Migrate to commit identifier for version keeping
https://bugs.webkit.org/show_bug.cgi?id=241469
Patch by Philippe Normand <ph...@igalia.com> on 2022-06-14
Reviewed by Adrian Perez de Castro and Jonathan Bedard.
* Tools/buildstream/utils/generate-version:
* Tools/glib/svn-revision: Deleted.
Canonical link: https://commits.webkit.org/251528@main
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/buildstream/utils/generate-version (295522 => 295523)
--- trunk/Tools/buildstream/utils/generate-version 2022-06-14 14:53:44 UTC (rev 295522)
+++ trunk/Tools/buildstream/utils/generate-version 2022-06-14 16:19:43 UTC (rev 295523)
@@ -3,7 +3,7 @@
datestring=$(date -Idate)
-version=$($PWD/../glib/svn-revision)
+version=$($PWD/../Scripts/git-webkit find HEAD --json | jq --raw-output .identifier)
cat >$1 <<EOF
# no-commit
Deleted: trunk/Tools/glib/svn-revision (295522 => 295523)
--- trunk/Tools/glib/svn-revision 2022-06-14 14:53:44 UTC (rev 295522)
+++ trunk/Tools/glib/svn-revision 2022-06-14 16:19:43 UTC (rev 295523)
@@ -1,30 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2019 Igalia S.L.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-import os
-import sys
-
-top_level_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", ".."))
-sys.path.insert(0, os.path.join(top_level_directory, "Tools", "Scripts"))
-
-from webkitpy.common.checkout.scm.detection import SCMDetector
-from webkitpy.common.system.executive import Executive
-from webkitpy.common.system.filesystem import FileSystem
-
-scm = SCMDetector(FileSystem(), Executive()).default_scm()
-print ("r" + scm.head_svn_revision())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
