verilator: Move to new template method.

litex-hub · Sep 18, 2018 · 9f02aa5 · 9f02aa5
1 parent aea1eda
commit 9f02aa5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,7 +59,7 @@ env:
   - PACKAGE=icestorm
   - PACKAGE=iverilog
   - PACKAGE=nextpnr
-  - PACKAGE=verilator           CONDA_BUILD_VERSION=2.1.17
+  - PACKAGE=verilator
   - PACKAGE=vtr                 CONDA_CHANNELS=conda-forge
   - PACKAGE=yosys
 

diff --git a/verilator/meta.yaml b/verilator/meta.yaml
@@ -8,7 +8,14 @@ source:
 
 build:
   detect_binary_files_with_prefix: True
-  number: 1
+  # y==GIT_DESCRIBE_NUMBER, z==DATESTR, x==GIT_DESCRIBE_HASH
+  #
+  # number: 10693001803050325
+  #         1yyyy00zzzzzzzzzz
+  number: {{ '1%04i00%s'|format(environ.get('GIT_DESCRIBE_NUMBER')|int, environ.get('DATESTR')) }}
+  # string: 0693.1803050325.g588ce0e3
+  #         yyyy.zzzzzzzzzz.gxxxxxxxx
+  string: {{ '%04i'|format(environ.get('GIT_DESCRIBE_NUMBER')|int) }}.{{ environ.get('DATESTR') }}.{{ environ.get('GIT_DESCRIBE_HASH', 'unknown') }}
   script_env:
     - CI
     - TRAVIS