Fix includes

rebar.config

@@ -1,23 +0,0 @@
-%% -*- mode: erlang; indent-tabs-mode: nil -*-
-
-{erl_opts, [debug_info]}.
-
-{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {tag, "v3.2.0"}}}
-       , {getopt, "1.0.1"}
-       , {eblake2, "1.0.0"}
-       , {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}}
-       ]}.
-
-{dialyzer, [
-            {warnings, [unknown]},
-            {plt_apps, all_deps},
-            {base_plt_apps, [erts, kernel, stdlib, crypto, mnesia]}
-           ]}.
-
-{relx, [{release, {aesophia, "7.1.0"},
-         [aesophia, aebytecode, getopt]},
-
-        {dev_mode, true},
-        {include_erts, false},
-
-        {extended_start_script, true}]}.

rebar.lock

@@ -1,31 +0,0 @@
-{"1.2.0",
-[{<<"aebytecode">>,
-  {git,"https://github.com/aeternity/aebytecode.git",
-       {ref,"2a0a397afad6b45da52572170f718194018bf33c"}},
-  0},
- {<<"aeserialization">>,
-  {git,"https://github.com/aeternity/aeserialization.git",
-       {ref,"eb68fe331bd476910394966b7f5ede7a74d37e35"}},
-  1},
- {<<"base58">>,
-  {git,"https://github.com/aeternity/erl-base58.git",
-       {ref,"60a335668a60328a29f9731b67c4a0e9e3d50ab6"}},
-  2},
- {<<"eblake2">>,{pkg,<<"eblake2">>,<<"1.0.0">>},0},
- {<<"enacl">>,
-  {git,"https://github.com/aeternity/enacl.git",
-       {ref,"793ddb502f7fe081302e1c42227dca70b09f8e17"}},
-  2},
- {<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0},
- {<<"jsx">>,
-  {git,"https://github.com/talentdeficit/jsx.git",
-       {ref,"3074d4865b3385a050badf7828ad31490d860df5"}},
-  0}]}.
-[
-{pkg_hash,[
- {<<"eblake2">>, <<"EC8AD20E438AAB3F2E8D5D118C366A0754219195F8A0F536587440F8F9BCF2EF">>},
- {<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>}]},
-{pkg_hash_ext,[
- {<<"eblake2">>, <<"3C4D300A91845B25D501929A26AC2E6F7157480846FAB2347A4C11AE52E08A99">>},
- {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>}]}
-].

src/aeso_aci.erl

@@ -8,6 +8,7 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_aci).
+-vsn("7.1.1").
 
 -export([ file/2
         , file/3

src/aeso_ast.erl

@@ -1,4 +1,5 @@
 -module(aeso_ast).
+-vsn("7.1.1").
 
 -export([int/2,
          line/1,

src/aeso_ast_infer_types.erl

@@ -11,6 +11,7 @@
 %%% instances of the compiler to be run in parallel.
 
 -module(aeso_ast_infer_types).
+-vsn("7.1.1").
 
 -export([ infer/1
         , infer/2

src/aeso_ast_to_fcode.erl

@@ -8,6 +8,7 @@
 %%%
 %%%-------------------------------------------------------------------
 -module(aeso_ast_to_fcode).
+-vsn("7.1.1").
 
 -export([ast_to_fcode/2, format_fexpr/1]).
 -export_type([fcode/0, fexpr/0, fun_def/0]).

src/aeso_compiler.erl

@@ -7,6 +7,7 @@
 %%% Created : 12 Dec 2017
 %%%-------------------------------------------------------------------
 -module(aeso_compiler).
+-vsn("7.1.1").
 
 -export([ file/1
         , file/2
@@ -25,7 +26,7 @@
         , validate_byte_code/3
         ]).
 
--include_lib("aebytecode/include/aeb_opcodes.hrl").
+-include("$aebytecode_include/aeb_opcodes.hrl").
 -include("aeso_utils.hrl").
 
 

src/aeso_errors.erl

@@ -6,6 +6,7 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_errors).
+-vsn("7.1.1").
 
 -type src_file()   :: no_file | iolist().
 

src/aeso_fcode_to_fate.erl

@@ -8,6 +8,7 @@
 %%%
 %%%-------------------------------------------------------------------
 -module(aeso_fcode_to_fate).
+-vsn("7.1.1").
 
 -export([compile/3, compile/4, term_to_fate/1, term_to_fate/2]).
 

src/aeso_parse_lib.erl

@@ -7,6 +7,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_parse_lib).
+-vsn("7.1.1").
 
 -export([parse/2,
          return/1, fail/0, fail/1, fail/2, map/2, bind/2,

src/aeso_parser.erl

@@ -3,6 +3,7 @@
 %%% Description :
 %%% Created     : 1 Mar 2018 by Ulf Norell
 -module(aeso_parser).
+-vsn("7.1.1").
 -compile({no_auto_import,[map_get/2]}).
 
 -export([string/1,

src/aeso_pretty.erl

@@ -6,6 +6,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_pretty).
+-vsn("7.1.1").
 
 -import(prettypr, [text/1, sep/1, above/2, beside/2, nest/2, empty/0]).
 

src/aeso_scan.erl

@@ -6,6 +6,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_scan).
+-vsn("7.1.1").
 
 -export([scan/1, utf8_encode/1]).
 

src/aeso_scan_lib.erl

@@ -5,6 +5,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_scan_lib).
+-vsn("7.1.1").
 
 -export([compile/1, string/3,
          token/1, token/2, symbol/0, skip/0,

src/aeso_stdlib.erl

@@ -9,6 +9,7 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_stdlib).
+-vsn("7.1.1").
 
 -export([stdlib_include_path/0]).
 

src/aeso_syntax.erl

@@ -7,6 +7,7 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_syntax).
+-vsn("7.1.1").
 
 -export([get_ann/1, get_ann/2, get_ann/3, set_ann/2, qualify/2]).
 

src/aeso_syntax_utils.erl

@@ -5,6 +5,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_syntax_utils).
+-vsn("7.1.1").
 
 -export([used_ids/1, used_types/2, used/1]).
 

src/aeso_utils.erl

@@ -5,6 +5,7 @@
 %%% @end
 %%%-------------------------------------------------------------------
 -module(aeso_utils).
+-vsn("7.1.1").
 
 -export([scc/1]).
 

src/aeso_vm_decode.erl

@@ -5,10 +5,11 @@
 %%%-------------------------------------------------------------------
 
 -module(aeso_vm_decode).
+-vsn("7.1.1").
 
 -export([ from_fate/2 ]).
 
--include_lib("aebytecode/include/aeb_fate_data.hrl").
+-include("$aebytecode_include/aeb_fate_data.hrl").
 
 -spec from_fate(aeso_syntax:type(), aeb_fate_data:fate_type()) -> aeso_syntax:expr().
 from_fate({id, _, "address"}, ?FATE_ADDRESS(Bin)) -> {account_pubkey, [], Bin};

src/aeso_warnings.erl

@@ -1,4 +1,5 @@
 -module(aeso_warnings).
+-vsn("7.1.1").
 
 -record(warn, { pos     :: aeso_errors:pos()
               , message :: iolist()

zomp.meta

@@ -12,7 +12,7 @@
 {license,skip}.
 {modules,[]}.
 {name,"AE Sophia Compiler"}.
-{package_id,{"otpr","aesophia",{7,1,0}}}.
+{package_id,{"otpr","aesophia",{7,1,1}}}.
 {prefix,none}.
 {repo_url,"https://github.com/aeternity/aesophia"}.
 {tags,["aeternity","blockchain","sophia","crypto","ae","compiler"]}.

zomp_prep

@@ -0,0 +1,19 @@
+#! /bin/bash
+
+# This is a small pre-packaging source generation and include correction script that should be
+# run before packaging this project for use with ZX/Zomp.
+
+rm -rf _build
+cd src
+for f in $(ls *.erl)
+do
+    echo "Updating includes in: $f"
+    sed -i 's/aebytecode\/include\///g' "$f"
+    sed -i 's/\.\.\/include\///g' "$f"
+    sed -i 's/include_lib/include/g' "$f"
+done
+sed -i 's/aeb_opcodes\.hrl/\$aebytecode_include\/aeb_opcodes\.hrl/' aeso_compiler.erl
+sed -i 's/aeb_fate_data\.hrl/\$aebytecode_include\/aeb_fate_data\.hrl/' aeso_vm_decode.erl
+cd ..
+rm -f ebin/*.beam
+rm -f rebar*