Skip to content

Commit

Permalink
Update chisel3.5 and remove chisel3 jar
Browse files Browse the repository at this point in the history
  • Loading branch information
colin4124 committed Feb 24, 2022
1 parent 2016de8 commit e62968d
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: Scratchip CI
language: python
python:
- "3.9"
script:
- python setup.py bdist_wheel
before_deploy:
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
pyyaml
chisel3-jar
mill-bin
mill-cache
3 changes: 2 additions & 1 deletion scratchip/assets/Demo.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ class {top_name} extends Module {{
}}

object Main extends App {{
Driver.execute(args, () => new {top_name})
(new chisel3.stage.ChiselStage)
.emitVerilog(new {top_name}, args)
}}
6 changes: 1 addition & 5 deletions scratchip/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import tarfile
import shutil
import yaml
import chisel3_jar
import mill_bin
import mill_cache
import glob
Expand Down Expand Up @@ -36,7 +35,7 @@ class ScratChip:
prj_name = "None"
prj_path = "None"
top_name = "None"
scratchip_path = 'builds/scratchip'
scratchip_path = '.scratchip'
cfg = None

def __init__(self, prj_name, cfg):
Expand All @@ -62,16 +61,13 @@ def init(self):
cache_path = os.path.join(self.prj_path, self.scratchip_path)
mill_path = os.path.join(self.prj_path, self.scratchip_path + '/mill')
jars_path = os.path.join(self.prj_path, self.scratchip_path + '/jars')
chisel3_jar_path = os.path.join(jars_path, 'chisel3.jar')

if not os.path.exists(cache_path):
self.extract_cache(mill_cache.source, cache_path)
if not os.path.exists(mill_path):
shutil.copyfile(mill_bin.source, mill_path)
if not os.path.exists(jars_path):
os.makedirs(jars_path)
if not os.path.exists(chisel3_jar_path):
shutil.copyfile(chisel3_jar.source, chisel3_jar_path)

# create project's YAML template
prj_yml_dest = os.path.join(self.prj_path, 'project.yml')
Expand Down
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
packages=["scratchip"],
package_data={
"scratchip": [
"jars/chisel3.jar",
"assets/default.yaml",
"assets/project.yml",
"assets/build.sc",
Expand All @@ -35,7 +34,6 @@
entry_points={"console_scripts": ["scratchip = scratchip.main:main"]},
setup_requires=["setuptools_scm",],
install_requires=[
"chisel3-jar",
"mill-bin",
"mill-cache",
"pyyaml",
Expand Down

0 comments on commit e62968d

Please sign in to comment.