This commit is contained in:
Reid 'arrdem' McKenzie 2022-11-19 23:52:38 -07:00
parent d7a0382927
commit c11c64f557
3 changed files with 0 additions and 9 deletions

View file

@ -3,12 +3,10 @@ The Zapp compiler.
""" """
import argparse import argparse
import io
import json import json
import os import os
import pathlib import pathlib
import stat import stat
import sys
import zipfile import zipfile
parser = argparse.ArgumentParser(description="The (bootstrap) Zapp compiler") parser = argparse.ArgumentParser(description="The (bootstrap) Zapp compiler")

View file

@ -3,19 +3,16 @@ The Zapp! compiler.
""" """
import argparse import argparse
import io
import json import json
import os import os
import pathlib import pathlib
import stat import stat
import sys import sys
import zipfile import zipfile
from collections import defaultdict
from email.parser import Parser from email.parser import Parser
from itertools import chain from itertools import chain
from pathlib import Path from pathlib import Path
from pprint import pprint from pprint import pprint
from shutil import move
from tempfile import TemporaryDirectory from tempfile import TemporaryDirectory
from zapp.support.pep425 import compress_tags, decompress_tag from zapp.support.pep425 import compress_tags, decompress_tag

View file

@ -105,9 +105,6 @@ def _zapp_impl(ctx):
stored_path = _store_path(input_file.short_path, ctx, import_roots) stored_path = _store_path(input_file.short_path, ctx, import_roots)
if stored_path: if stored_path:
local_path = input_file.path local_path = input_file.path
conflicts = [e for e in sources_map if e[0] == stored_path]
if conflicts:
print("File %s conflicts with others, %s" % (input_file, conflicts))
sources_map.append([stored_path, local_path]) sources_map.append([stored_path, local_path])
_check_script(main_py_ref, sources_map) _check_script(main_py_ref, sources_map)
@ -154,7 +151,6 @@ def _zapp_impl(ctx):
progress_message = "Building zapp file %s" % ctx.label, progress_message = "Building zapp file %s" % ctx.label,
executable = ctx.executable.compiler, executable = ctx.executable.compiler,
arguments = [ arguments = [
"--debug",
"-o", ctx.outputs.executable.path, "-o", ctx.outputs.executable.path,
manifest_file.path manifest_file.path
], ],