Request 2943 (accepted)

guam.spec Changed

@@ -20,7 +20,7 @@
 %define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%%{VERSION}" %{1})
 
 Name:               guam
-Version:            0.9.11
+Version:            0.9.12
 Release:            1%{?dist}
 Summary:            A Smart Reverse IMAP Proxy
 
@@ -31,8 +31,6 @@
 Source0:            guam-%{version}.tar.gz
 Source100:          plesk.sys.config
 
-#Patch9991:          nodeps.patch
-
 BuildRequires:      erlang >= 17.4
 BuildRequires:      erlang-asn1
 BuildRequires:      erlang-common_test
@@ -55,7 +53,6 @@
 BuildRequires:      erlang-tools
 BuildRequires:      erlang-wx
 BuildRequires:      erlang-xmerl
-BuildRequires:      git
 
 Requires:           erlang
 Requires:           which
@@ -155,6 +152,7 @@
 # Copy over the release directory as well
 cp -av _build/default/rel/%{name}/releases/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/
 
+# More configuration
 %if 0%{?plesk}
 install -m 644 -p %{SOURCE100} %{buildroot}%{_sysconfdir}/guam/sys.config
 %endif
@@ -239,6 +237,9 @@
 %endif
 
 %changelog
+* Tue Apr 19 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 0.9.12-1
+- Release of version 0.9.12
+
 * Mon Jun 07 2021 Christian Mollekopf <mollekopf@kolabsys.com> - 0.9.11-1
 - Release of version 0.9.11

nodeps.patch Deleted

README.md Changed

buildtarball.sh Changed

debian.changelog Changed

debian.control Changed

@@ -5,37 +5,17 @@
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 10) | dh-systemd (>= 1.5),
 	erlang (>= 17.4),
-	erlang-eimap (>= 0.3.0),
-	erlang-goldrush (>= 0.2.0),
-	erlang-lager,
-	erlang-lager-syslog,
-	psa | bash,
-	erlang-rebar3 (>= 3.3.2)
+	psa | bash
 Homepage: https://kolab.org/about/guam
 
 Package: guam
 Architecture: any
 Section: mail
-Depends: ${misc:Depends}, ${dist:GuamDepends}
+Depends: erlang-base | erlang-base-hipe,
+    erlang-asn1,
+    erlang-inets,
+    erlang-public-key
+Conflicts: erlang-goldrush, erlang-eimap, erlang-lager, erlang-syslog
 Description: Smart Reverse IMAP Proxy
  Guam is a smart, unjustly outcast Reverse IMAP Proxy that lives at
  the perimeter of your IMAP environment.
-
-Package: guam-libs
-Architecture: any
-Section: mail
-Depends: ${misc:Depends}, ${dist:GuamLibDepends}
-Conflicts: guam-bundled-libs
-Description: Dependency meta-package for Guam
- This package pulls in all the library dependencies required to run Guam.
- Debian backports users who have a backported Erlang version may need to install
- guam-bundled-libs instead.
-
-Package: guam-bundled-libs
-Architecture: any
-Section: mail
-Depends: ${misc:Depends}, ${dist:GuamBundleDepends}
-Conflicts: guam-libs
-Description: Bundled runtime environment for Guam
- This is a support package for Debian backports users who have a backported
- Erlang version. All others should preferably use guam-libs.

debian.rules Changed

@@ -3,73 +3,49 @@
 include /usr/share/dpkg/pkg-info.mk
 
 DESTDIR   = $(CURDIR)/debian/guam
-LIBDIR    = $(CURDIR)/debian/guam-libs
-BUNDLEDIR = $(CURDIR)/debian/guam-bundled-libs
-
-# The versions of all dependencies are hardcoded by relx (which honestly sucks).
-# The following magic tries to ensure that the Debian package's dependencies are
-# pinned to the versions present on the build machine.
-# Usually, we pull in the package "guam-libs", which declares all the regular
-# dependencies and creates an appropriate "lib" symlink.
-# However, if the dependencies cannot be satisfied on the end user's machine -
-# for instance because a  different Erlang version was installed from backports
-# - we make the package manager pull in an extra package "guam-bundled-libs"
-# that contains all the dependencies in the exact versions expected by relx.
-#
-# For maintainers, the bottom line is this: please revision-bump this package
-# every time one of its dependencies gets version-bumped.
-currver = $(shell dpkg-query -f '$${Version}' -W $(1) | sed 's/[+-].*$$//')
-nextver = $(shell echo $(call currver,$(1)) | perl -pe 's/((\d+\.)*)(\d+)$$/$$1.($$3+1)/e')
-pinvermin = $(1) (>= $(call currver,$(1)))
-pinvermax = $(1) (<< $(call nextver,$(1)))
-pinver    = $(call pinvermin,$(1)), $(call pinvermax,$(1))
-pinvererlmin = $(1) (>= $(call currver,erlang))
-pinvererlmax = $(1) (<< $(call nextver,erlang))
-
-# We ship these packages ourselves, so they don't need bundling
-KOLAB_PROVIDED_DEPS := $(call pinver,erlang-eimap), $(call pinver,erlang-lager-syslog)
-EIMAP_DIR        := eimap-$(call currver,erlang-eimap)
-LAGER_SYSLOG_DIR := lager_syslog-$(call currver,erlang-lager-syslog)
-
-SUBSTVARS += -Vdist:GuamDepends="guam-libs (= $(DEB_VERSION)) | guam-bundled-libs (= $(DEB_VERSION))"
-SUBSTVARS += -Vdist:GuamLibDepends="$(call pinvererlmin,erlang-base) | $(call pinvererlmin,erlang-base-hipe), $(call pinvererlmax,erlang-base) | $(call pinvererlmax,erlang-base-hipe), $(KOLAB_PROVIDED_DEPS), $(call pinver,erlang-asn1), $(call pinver,erlang-goldrush), $(call pinver,erlang-inets), $(call pinver,erlang-lager), $(call pinver,erlang-public-key)"
-SUBSTVARS += -Vdist:GuamBundleDepends="$(KOLAB_PROVIDED_DEPS)"
 
 %:
 	dh $@ --with=systemd
 
 override_dh_auto_build:
-	sed -i -e 's/include_erts,\s*false/include_erts, true/' rebar.config
 	export DEBUG=1
-	export HEX_OFFLINE=1
+	export HEX_OFFLINE=true
+	export REBAR_CACHE_DIR="cache/rebar3/"
+
+	# Rebuild all beam files (The otp version from the tarball may not match)
+	rm -rf _build
+	./rebar3 compile
+
 	./rebar3 release \
 		--dev-mode false \
 		--relname guam \
 		--relvsn $(DEB_VERSION_UPSTREAM) \
 		--verbose
 
-
 override_dh_auto_clean:
-	./rebar3 clean || :
+    # do nothing, rebar3 clean would clear the artifacts that we need above
+    #./rebar3 clean || :
 
 override_dh_auto_test:
+	export DEBUG=1
+	export HEX_OFFLINE=true
+	export REBAR_CACHE_DIR="cache/rebar3/"
 	./rebar3 eunit -v || :
+	./rebar3 ct -v || :
 
 override_dh_auto_install:
-	mkdir -p $(DESTDIR)/usr/sbin $(DESTDIR)/etc/guam \
-		$(DESTDIR)/lib/systemd/system $(DESTDIR)/var/log/ \
+	mkdir -p $(DESTDIR)/usr/sbin \
+		$(DESTDIR)/etc/guam \
+		$(DESTDIR)/lib/systemd/system \
+		$(DESTDIR)/var/log/ \
 		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ \
-		$(DESTDIR)/usr/lib/erlang/bin $(DESTDIR)/var/log/guam
+		$(DESTDIR)/usr/lib/erlang/bin \
+		$(DESTDIR)/var/log/guam
 	chmod o= $(DESTDIR)/var/log/guam
 
+	# Service scripts
 	install -p -m 644 contrib/guam.service \
-	        $(DESTDIR)/lib/systemd/system/guam.service
-
-	cp -a _build/default/rel/guam/bin \
-		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
-
-	cp -a _build/default/rel/guam/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ebin \
-		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+			$(DESTDIR)/lib/systemd/system/guam.service
 
 	rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/sys.config
 	rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/vm.args
@@ -77,6 +53,7 @@
 	cp -a _build/default/rel/guam/releases \
 		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
 
+	# Configuration
 	if [ -f "/etc/plesk-release" ]; then \
 		cp ../SOURCES/plesk.sys.config \
 			$(DESTDIR)/etc/guam/sys.config ; \
@@ -99,30 +76,29 @@
 
 	ln -s ../../../../../var/log/guam $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/log
 
+	cp -a _build/default/rel/guam/bin \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+
+	# Remove the sources
+	find _build/default/rel/guam/lib/ -type d -name "src" -exec rm -Rf {} +
+
+	# Copy over all lib dirs
+	cp -av _build/default/rel/guam/lib/* $(DESTDIR)/usr/lib/erlang/lib/
+
+	# Copy over the release directory as well
+	cp -av _build/default/rel/guam/releases/ $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+
 	echo '#!/bin/bash' > $(DESTDIR)/usr/sbin/guam
 	echo 'exec /usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/bin/guam $$*' \
-	     >> $(DESTDIR)/usr/sbin/guam
+		 >> $(DESTDIR)/usr/sbin/guam
 	chmod +x $(DESTDIR)/usr/sbin/guam
 
 	ln -s ../lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/bin/guam \
 		$(DESTDIR)/usr/lib/erlang/bin/kolab_guam
 
 	# Symlink for system-installed libraries
-	mkdir -p $(LIBDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	ln -s ../../lib $(LIBDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib
-
-	# Bundled runtime system and libraries
-	mkdir -p $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	cp -a _build/default/rel/guam/erts-* \
-		$(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
-	cp -a _build/default/rel/guam/lib \
-		$(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
-	rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	ln -s .. $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
-	for dir in $(EIMAP_DIR) $(LAGER_SYSLOG_DIR); do \
-		rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
-		ln -s ../../$$dir $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
-	done
+	mkdir -p $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
+	ln -s ../../lib $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib
 
 override_dh_gencontrol:
-	dh_gencontrol -- $(SUBSTVARS)
+	dh_gencontrol

debian.series Changed

guam-0.9.11.tar.gz/CHANGELOG.md -> guam-0.9.12.tar.gz/CHANGELOG.md Changed

guam-0.9.11.tar.gz/_checkouts/eimap/CHANGELOG.md -> guam-0.9.12.tar.gz/_checkouts/eimap/CHANGELOG.md Changed

guam-0.9.11.tar.gz/_checkouts/eimap/rebar.config -> guam-0.9.12.tar.gz/_checkouts/eimap/rebar.config Changed

guam-0.9.11.tar.gz/_checkouts/eimap/src/eimap.app.src -> guam-0.9.12.tar.gz/_checkouts/eimap/src/eimap.app.src Changed

guam-0.9.11.tar.gz/_checkouts/eimap/src/eimap_command.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/src/eimap_command.erl Changed

@@ -38,29 +38,29 @@
 
 process_lines(_ParseTaggedLine, _Tag, LastPartialLine, [], Acc, Module) -> { more, { LastPartialLine, Acc, Module } };
 process_lines(ParseTaggedLine, Tag, LastPartialLine, [Line|MoreLines], Acc, Module) ->
-    { FirstLine, ContinuationBytes } = eimap_utils:num_literal_continuation_bytes(Line),
-    process_line(ContinuationBytes, ParseTaggedLine, eimap_utils:is_tagged_response(FirstLine, Tag), Tag, LastPartialLine, FirstLine, MoreLines, Acc, Module).
+    { FirstLine, ContinuationBytes, Result } = eimap_utils:num_literal_continuation_bytes(Line),
+    process_line(Result, ContinuationBytes, ParseTaggedLine, eimap_utils:is_tagged_response(FirstLine, Tag), Tag, LastPartialLine, FirstLine, MoreLines, Acc, Module).
 
 
-process_line(ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, [<<>>|MoreLines], Acc, Module) ->
+process_line(Result, ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, [<<>>|MoreLines], Acc, Module) ->
     %% skip empty lines
-    process_line(ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, MoreLines, Acc, Module);
-process_line(0, ParseTaggedLine, tagged, Tag, _LastPartialLine, Line, _MoreLines, Acc, Module) ->
+    process_line(Result, ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, MoreLines, Acc, Module);
+process_line(none, _ContinuationBytes, ParseTaggedLine, tagged, Tag, _LastPartialLine, Line, _MoreLines, Acc, Module) ->
     Checked = eimap_utils:check_response_for_failure(Line, Tag),
     Module:formulate_response(Checked, parse_tagged(Checked, ParseTaggedLine, Line, Acc, Module));
-process_line(0, ParseTaggedLine, untagged, Tag, LastPartialLine, Line, MoreLines, Acc, Module) ->
     %io:format("Calling it here with ~p~n~n...", [Line]),
+process_line(none, _ContinuationBytes, ParseTaggedLine, untagged, Tag, LastPartialLine, Line, MoreLines, Acc, Module) ->
     process_lines(ParseTaggedLine, Tag, LastPartialLine, MoreLines, Module:process_line(Line, Acc), Module);
-process_line(ContinuationBytes, ParseTaggedLine, _IsTagged, Tag, LastPartialLine, Line, [], Acc, Module) ->
+process_line(_Result, ContinuationBytes, ParseTaggedLine, _IsTagged, Tag, LastPartialLine, Line, [], Acc, Module) ->
     %% the line was continued, but there is no more lines ... so this line is now our last partial line. more must be on its way
     io:format("Missing lines!~p~n~n", [Acc]),
     BytesAsBinary = integer_to_binary(ContinuationBytes),
     process_lines(ParseTaggedLine, Tag, <<Line/binary, ${, BytesAsBinary/binary, $}, LastPartialLine/binary>>, [], Acc, Module);
-process_line(_ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, [NextLine|MoreLines], Acc, Module) ->
-    { StrippedNextLine, NextContinuationBytes } = eimap_utils:num_literal_continuation_bytes(NextLine),
+process_line(_Result, _ContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, Line, [NextLine|MoreLines], Acc, Module) ->
+    { StrippedNextLine, NextContinuationBytes, Result } = eimap_utils:num_literal_continuation_bytes(NextLine),
     io:format("Connected up the next line: ~p ~i~n", [StrippedNextLine, NextContinuationBytes]),
     FullLine = <<Line/binary, StrippedNextLine/binary>>,
-    process_line(NextContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, FullLine, MoreLines, Acc, Module).
+    process_line(Result, NextContinuationBytes, ParseTaggedLine, IsTagged, Tag, LastPartialLine, FullLine, MoreLines, Acc, Module).
 
 formulate_response(ok, Data) -> { fini, Data };
 formulate_response({ _, Reason }, _Data) -> { error, Reason }.

guam-0.9.11.tar.gz/_checkouts/eimap/src/eimap_utils.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/src/eimap_utils.erl Changed

@@ -25,7 +25,9 @@
          new_imap_compressors/0,
          only_full_lines/1,
          binary_to_atom/1,
-         num_literal_continuation_bytes/1
+         num_literal_continuation_bytes/1,
+         split_lines/1,
+         split_lines_with_literals/1
         ]).
 
 %% Translate the folder name in to a fully qualified folder path such as it
@@ -98,13 +100,13 @@
         _ -> untagged
     end.
 
--spec num_literal_continuation_bytes(Buffer :: binary()) -> { BufferSansContinuation :: binary(), NumberBytes :: integer() }.
+-spec num_literal_continuation_bytes(Buffer :: binary()) -> { BufferSansContinuation :: binary(), NumberBytes :: integer(), found|none }.
 num_literal_continuation_bytes(Buffer) when size(Buffer) < 4 ->
-    { Buffer, 0 };
+    { Buffer, 0, none };
 num_literal_continuation_bytes(Buffer) ->
     case binary:last(Buffer) =:= $} of
         true -> number_of_bytes_in_continuation(Buffer);
-        false -> { Buffer, 0 }
+        false -> { Buffer, 0, none }
     end.
 
 number_of_bytes_in_continuation(Buffer) ->
@@ -120,7 +122,7 @@
     end.
 
 confirm_continuation(Buffer, -1) ->
-    { Buffer, 0 };
+    { Buffer, 0, none };
 confirm_continuation(Buffer, OpenBracePos) ->
     BufferSize = size(Buffer),
     % Strip any '+' following the literal size (due to LITERAL+)
@@ -130,9 +132,9 @@
     end,
 
     try binary_to_integer(LiteralSize) of
-        Result -> { binary:part(Buffer, 0, OpenBracePos), Result }
+        Result -> { binary:part(Buffer, 0, OpenBracePos), Result, found }
     catch
-        _:_ -> { Buffer, 0 }
+        _:_ -> { Buffer, 0, none }
     end.
 
 -spec remove_tag_from_response(Buffer :: binary(), Tag :: undefine | binary(), Check :: check | trust) -> Command :: binary().
@@ -237,6 +239,38 @@
 ensure_binary(Arg) when is_atom(Arg) -> atom_to_binary(Arg, latin1);
 ensure_binary(_Arg) -> <<>>.
 
+% Split Data into a list of lines separated by \r\n (each entry including the \r\n)
+-spec split_lines_with_literals(Buffer :: binary()) -> {CompleteLines :: [binary()], TrailingFragmentaryLine :: binary()}.
+split_lines_with_literals(Data) ->
+    Result = split_with_literals([], Data, binary:compile_pattern(<<"\r\n">>), 0),
+    Result.
+
+split_with_literals(Lines, Data, Pattern, Offset) ->
+    case binary:match(Data, Pattern, [{scope, {Offset, size(Data) - Offset}}]) of
+         nomatch -> {lists:reverse(Lines), Data};
+         { Start, Length } ->
+              case binary:at(Data, max(0, Start - 1)) of
+                  $} -> split_with_literals(Lines, Data, Pattern, Start + 1);
+                  _ -> Num = Start + Length,
+                      <<Line:Num/binary, Remainder/binary>> = Data,
+                      split_with_literals([Line|Lines], Remainder, Pattern, 0)
+              end
+     end.
+
+% Split Data into a list of lines separated by \r\n (each entry including the \r\n)
+-spec split_lines(Buffer :: binary()) -> {CompleteLines :: [binary()], TrailingFragmentaryLine :: binary()}.
+split_lines(Data) ->
+    split([], Data, binary:compile_pattern(<<"\r\n">>)).
+
+split(Lines, Data, Pattern) ->
+     case binary:match(Data, Pattern) of
+         nomatch -> {lists:reverse(Lines), Data};
+         { Start, Length } ->
+             Num = Start + Length,
+             <<Line:Num/binary, Remainder/binary>> = Data,
+             split([Line|Lines], Remainder, Pattern)
+     end.
+
 new_imap_compressors() ->
     Inflator = zlib:open(),
     ok = zlib:inflateInit(Inflator, -15),

guam-0.9.11.tar.gz/_checkouts/eimap/test/eimap_command_getmetadata_tests.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/test/eimap_command_getmetadata_tests.erl Changed

guam-0.9.11.tar.gz/_checkouts/eimap/test/eimap_command_tests.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/test/eimap_command_tests.erl Changed

guam-0.9.11.tar.gz/_checkouts/eimap/test/eimap_utils_tests.erl -> guam-0.9.12.tar.gz/_checkouts/eimap/test/eimap_utils_tests.erl Changed

@@ -183,18 +183,34 @@
 num_literal_continuation_bytes_test_() ->
     Data =
     [
-        { <<"abcd">>, { <<"abcd">>, 0 } },
-        { <<"abcd{5}">>, { <<"abcd">>, 5 } },
-        { <<"abcd{100}">>, { <<"abcd">>, 100 } },
-        { <<"123abcd{100}">>, { <<"123abcd">>, 100  } },
-        { <<"ab{123abcd{100}">>, { <<"ab{123abcd">>, 100  } },
-        { <<"ab{123abcd{1{00}">>, { <<"ab{123abcd{1">>, 0 } },
-        { <<"abcd{aa0}">>, { <<"abcd{aa0}">>, 0 } },
-        { <<"abcd{10aa0}">>, { <<"abcd{10aa0}">>, 0 } },
-        { <<"abcd100}">>, { <<"abcd100}">>, 0 } },
-        { <<"abcd100}">>, { <<"abcd100}">>, 0 } },
-        { <<"abcd{5+}">>, { <<"abcd">>, 5 } }
+        { <<"abcd">>, { <<"abcd">>, 0, none } },
+        { <<"abcd{0}">>, { <<"abcd">>, 0, found } },
+        { <<"abcd{5}">>, { <<"abcd">>, 5, found } },
+        { <<"abcd{100}">>, { <<"abcd">>, 100, found } },
+        { <<"123abcd{100}">>, { <<"123abcd">>, 100, found  } },
+        { <<"ab{123abcd{100}">>, { <<"ab{123abcd">>, 100, found  } },
+        { <<"ab{123abcd{1{00}">>, { <<"ab{123abcd{1">>, 0, found } },
+        { <<"abcd{aa0}">>, { <<"abcd{aa0}">>, 0, none } },
+        { <<"abcd{10aa0}">>, { <<"abcd{10aa0}">>, 0, none } },
+        { <<"abcd100}">>, { <<"abcd100}">>, 0, none } },
+        { <<"abcd100}">>, { <<"abcd100}">>, 0, none } },
+        { <<"abcd{5+}">>, { <<"abcd">>, 5, found } }
     ],
     lists:foldl(fun({ Input, Output}, Acc) -> [?_assertEqual(Output, eimap_utils:num_literal_continuation_bytes(Input)) | Acc] end, [], Data).
 
+split_lines_test_() ->
+    Data =
+    [
+        { <<"abcd\r\nabcd">>, { [<<"abcd\r\n">>], <<"abcd">> } },
+        { <<"\r\nabcd\r\nabcd\r\n\r\n">>, { [<<"\r\n">>, <<"abcd\r\n">>, <<"abcd\r\n">>, <<"\r\n">>], <<"">> } }
+    ],
+    lists:foldl(fun({ Input, Output}, Acc) -> [?_assertEqual(Output, eimap_utils:split_lines(Input)) | Acc] end, [], Data).
 
+split_lines_with_literals_test_() ->
+    Data =
+    [
+        { <<"abcd\r\nabcd">>, { [<<"abcd\r\n">>], <<"abcd">> } },
+        { <<"\r\nabcd\r\nabcd\r\n\r\n">>, { [<<"\r\n">>, <<"abcd\r\n">>, <<"abcd\r\n">>, <<"\r\n">>], <<"">> } },
+        { <<"abcd{5}\r\n12345\r\nabcd{3}">>, { [<<"abcd{5}\r\n12345\r\n">>], <<"abcd{3}">> } }
+    ],
+    lists:foldl(fun({ Input, Output}, Acc) -> [?_assertEqual(Output, eimap_utils:split_lines_with_literals(Input)) | Acc] end, [], Data).

guam-0.9.12.tar.gz/_checkouts/pc Added

guam-0.9.12.tar.gz/_checkouts/pc/.rebar3 Added

guam-0.9.12.tar.gz/_checkouts/pc/.rebar3/rebar_compiler_erl Added

guam-0.9.12.tar.gz/_checkouts/pc/.rebar3/rebar_compiler_erl/source.dag Added

guam-0.9.12.tar.gz/_checkouts/pc/LICENSE Added

@@ -0,0 +1,18 @@
+Copyright (c) 2015, Brian L. Troutwine <brian@troutwine.us>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file

guam-0.9.12.tar.gz/_checkouts/pc/README.md Added

@@ -0,0 +1,153 @@
+port_compiler
+=====
+
+A port compiler for rebar3.
+
+This plugin is intended to replicate the rebar2 support for compiling native
+code. It is not a drop-in replacement in terms of command-line interface but the
+exact configuration interface in projects' `rebar.config`s have been preserved.
+
+Use In Your Project
+---------------------
+
+Add the plugin to your `rebar.config`:
+
+```erlang
+{plugins, [pc]}.
+{provider_hooks,
+ [
+  {pre,
+   [
+    {compile, {pc, compile}},
+    {clean, {pc, clean}}
+   ]
+  }
+ ]
+}.
+```
+
+If you want to use tools like clang-tidy, don't forget to enable the compile commands db like this:
+
+```erlang
+{pc_clang_db, true}.
+```
+
+From your existing application:
+
+
+    $ rebar3 pc compile
+    ===> Fetching pc
+    ===> Compiling pc
+    ===> Verifying dependencies...
+    Compiling ...
+
+You should now have native code compiled.
+
+Use with Existing Dependency
+-----------------------------
+
+If your project depends on a dependency that used the rebar2 port compiler instead of forking and changing the `rebar.config` of that dependency you can use [overrides](http://www.rebar3.org/v3.0/docs/configuration#overrides) to inject the changes from your top level `rebar.config`. Using [jiffy](https://github.com/davisp/jiffy) as an example:
+
+
+```erlang
+{deps, [jiffy]}.
+
+{overrides,
+ [{override, jiffy, [
+     {plugins, [pc]},
+     {artifacts, ["priv/jiffy.so"]},
+     {provider_hooks, [
+         {post,
+             [
+             {compile, {pc, compile}},
+             {clean, {pc, clean}}
+             ]
+          }]
+      }
+  ]}
+]}.
+```
+
+Example
+---
+
+Looking for an example? See my fork of jiffy here and the changes to its
+`rebar.config`: https://github.com/blt/jiffy/commit/d4a0103daec5a646e71045bdf40f12a3eb82ace5
+
+- - -
+
+BELOW HERE BE DRAGONS
+
+```
+%% Supported configuration variables:
+%%
+%% * port_specs - Erlang list of tuples of the forms
+%%                {ArchRegex, TargetFile, Sources, Options}
+%%                {ArchRegex, TargetFile, Sources}
+%%                {TargetFile, Sources}
+%%
+%%                Note that if you want to use any of the rebar3 variables
+%%                below you must MUST use a ${}-style to get the expansion
+%%                to work. e.g. to expand REBAR_DEPS_DIR, do something like:
+%%
+%%                {port_specs, [{"priv/nif.so",
+%%                               ["c_src/nif.c",
+%%                                "${REBAR_DEPS_DIR}/foo/bar.c"]}]}.
+%%
+%%                This is a _very_ good way to be able to use your code both
+%%                as a top level app and a dependency.
+%%
+%%                CAVEAT! Not using {} is broken for the moment.
+%%
+%% * port_env - Erlang list of key/value pairs which will control
+%%              the environment when running the compiler and linker.
+%%              Variables set in the surrounding system shell are taken
+%%              into consideration when expanding port_env. Note that
+%%              for ERL_LDFLAGS, -lerl_interface is used for only those
+%%              Erlang/OTP versions where it exists (those prior to
+%%              version 23.0).
+%%
+%%              By default, the following variables are defined:
+%%              CC       - C compiler
+%%              CXX      - C++ compiler
+%%              CFLAGS   - C compiler
+%%              CXXFLAGS - C++ compiler
+%%              LDFLAGS  - Link flags
+%%              ERL_CFLAGS  - default -I paths for erts and ei
+%%              ERL_LDFLAGS - default -L and -lerl_interface -lei
+%%              DRV_CFLAGS  - flags that will be used for compiling
+%%              DRV_LDFLAGS - flags that will be used for linking
+%%              EXE_CFLAGS  - flags that will be used for compiling
+%%              EXE_LDFLAGS - flags that will be used for linking
+%%              ERL_EI_LIBDIR - ei library directory
+%%              DRV_CXX_TEMPLATE      - C++ command template
+%%              DRV_CC_TEMPLATE       - C command template
+%%              DRV_LINK_TEMPLATE     - C Linker command template
+%%              DRV_LINK_CXX_TEMPLATE - C++ Linker command template
+%%              EXE_CXX_TEMPLATE      - C++ command template
+%%              EXE_CC_TEMPLATE       - C command template
+%%              EXE_LINK_TEMPLATE     - C Linker command template
+%%              EXE_LINK_CXX_TEMPLATE - C++ Linker command template
+%%
+%%              Note that if you wish to extend (vs. replace) these variables,
+%%              you MUST include a shell-style reference in your definition.
+%%              e.g. to extend CFLAGS, do something like:
+%%
+%%              {port_env, [{"CFLAGS", "$CFLAGS -MyOtherOptions"}]}
+%%
+%%              It is also possible to specify platform specific options
+%%              by specifying a triplet where the first string is a regex
+%%              that is checked against Erlang's system architecture string.
+%%              e.g. to specify a CFLAG that only applies to x86_64 on linux
+%%              do:
+%%
+%%              {port_env, [{"x86_64.*-linux", "CFLAGS",
+%%                           "$CFLAGS -X86Options"}]}
+%%
+%%              Cross-arch environment variables to configure toolchain:
+%%              GET_ARCH to set the tool chain name to use
+%%              GET_ARCH_WORDSIZE (optional - to determine word size)"
+%%              word size is 32
+%%              GET_ARCH_VSN (optional - "
+%%              l version of CC/CXX is requested),
+```

guam-0.9.12.tar.gz/_checkouts/pc/ebin Added

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc.app Added

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc.beam Added

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_compilation.beam Added

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_port_env.beam Added

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_port_specs.beam Added

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_prv_clean.beam Added

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_prv_compile.beam Added

guam-0.9.12.tar.gz/_checkouts/pc/ebin/pc_util.beam Added

guam-0.9.12.tar.gz/_checkouts/pc/hex_metadata.config Added

guam-0.9.12.tar.gz/_checkouts/pc/rebar.config Added

guam-0.9.12.tar.gz/_checkouts/pc/rebar.lock Added

guam-0.9.12.tar.gz/_checkouts/pc/src Added

guam-0.9.12.tar.gz/_checkouts/pc/src/pc.app.src Added

guam-0.9.12.tar.gz/_checkouts/pc/src/pc.erl Added

guam-0.9.12.tar.gz/_checkouts/pc/src/pc_compilation.erl Added

@@ -0,0 +1,257 @@
+%% -------------------------------------------------------------------
+%%
+%% This file contains substantial portions of the original rebar_port_compiler.
+%% Special thanks to all the folks that contributed to that effort.
+%%
+%% -------------------------------------------------------------------
+%%
+%% Copyright (c) 2009 Dave Smith (dizzyd@dizzyd.com)
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+%%
+%% -------------------------------------------------------------------
+-module(pc_compilation).
+
+-export([compile_and_link/2, clean/2, compiler/1]).
+-export_type([]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+-spec compile_and_link(State :: rebar_state:t(),
+                       Specs :: [pc_port_specs:spec()]) -> ok.
+compile_and_link(State, Specs) ->
+    %% Compile each of the sources
+    NewBins = compile_sources(State, Specs),
+
+    %% Make sure that the target directories exist
+    lists:foreach(fun(Spec) ->
+                          Target = pc_port_specs:target(Spec),
+                          ok = filelib:ensure_dir(filename:join(rebar_state:dir(State), Target))
+                  end, Specs),
+
+    %% Only relink if necessary, given the Target
+    %% and list of new binaries
+    lists:foreach(
+      fun(Spec) ->
+              Target  = pc_port_specs:target(Spec),
+              Bins    = pc_port_specs:objects(Spec),
+              AllBins = [sets:from_list(Bins),
+                         sets:from_list(NewBins)],
+              Intersection = sets:intersection(AllBins),
+              case needs_link(Target, sets:to_list(Intersection)) of
+                  true ->
+                      LinkLang = pc_port_specs:link_lang(Spec),
+                      LinkTemplate = select_link_template(LinkLang, Target),
+                      Env = pc_port_specs:create_env(State, Spec),
+                      Cmd = expand_command(LinkTemplate, Env,
+                                           pc_util:strjoin(Bins, " "),
+                                           Target),
+                      rebar_api:info("Linking ~ts", [Target]),
+                      rebar_utils:sh(Cmd, [{env, Env}, {cd, rebar_state:dir(State)}]);
+                  false ->
+                      ok
+              end
+      end, Specs).
+
+clean(_State, Specs) ->
+    lists:foreach(fun(Spec) ->
+                          Target = pc_port_specs:target(Spec),
+                          Objects = pc_port_specs:objects(Spec),
+                          rebar_file_utils:delete_each([Target]),
+                          rebar_file_utils:delete_each(Objects),
+                          rebar_file_utils:delete_each(port_deps(Objects))
+                  end, Specs).
+
+%%%===================================================================
+%%% Internal Functions
+%%%===================================================================
+
+port_deps(SourceFiles) ->
+    [pc_util:replace_extension(O, ".d") || O <- SourceFiles].
+
+%%
+%% == compilation ==
+%%
+
+compile_sources(Config, Specs) ->
+    {NewBins, Db} =
+        lists:foldl(
+          fun(Spec, Acc) ->
+                  Sources = pc_port_specs:sources(Spec),
+                  Type    = pc_port_specs:type(Spec),
+                  Env     = pc_port_specs:create_env(Config, Spec),
+                  compile_each(Config, Sources, Type, Env, Acc)
+          end, {[], []}, Specs),
+    %% Rewrite clang compile commands database file only if something
+    %% was compiled.
+    case {NewBins, rebar_state:get(Config, pc_clang_db, false)} of
+        {[], _} ->
+            ok;
+        {_, true} ->
+            {ok, ClangDbFile} = file:open("compile_commands.json", [write]),
+            ok = io:fwrite(ClangDbFile, "[~n", []),
+            lists:foreach(fun(E) -> ok = io:fwrite(ClangDbFile, E, []) end, Db),
+            ok = io:fwrite(ClangDbFile, "]~n", []),
+            ok = file:close(ClangDbFile);
+        _ ->
+            ok
+    end,
+    NewBins.
+
+compile_each(_State, [], _Type, _Env, {NewBins, CDB}) ->
+    {lists:reverse(NewBins), lists:reverse(CDB)};
+compile_each(State, [Source | Rest], Type, Env, {NewBins, CDB}) ->
+    Ext = filename:extension(Source),
+    Bin = pc_util:replace_extension(Source, Ext, pc_port_specs:object_file_ext()),
+    Template = select_compile_template(Type, compiler(Ext)),
+    Cmd = expand_command(Template, Env, Source, Bin),
+    CDBEnt = cdb_entry(State, Source, Cmd, Rest),
+    NewCDB = [CDBEnt | CDB],
+    case needs_compile(Source, Bin) of
+        true ->
+            ShOpts = [ {env, Env}
+                     , return_on_error
+                     , {use_stdout, false}
+                     , {cd, rebar_state:dir(State)}
+                     ],
+            exec_compiler(State, Source, Cmd, ShOpts),
+            compile_each(State, Rest, Type, Env,
+                         {[Bin | NewBins], NewCDB});
+        false ->
+            compile_each(State, Rest, Type, Env, {NewBins, NewCDB})
+    end.
+
+%% Generate a clang compilation db entry for Src and Cmd
+cdb_entry(State, Src, Cmd, SrcRest) ->
+    %% Omit all variables from cmd, and use that as cmd in
+    %% CDB, because otherwise clang-* will complain about it.
+    CDBCmd = pc_util:strjoin(
+               lists:filter(
+                 fun("$"++_) -> false;
+                    (_)      -> true
+                 end,
+                 pc_util:strtok(Cmd, " ")),
+               " "),
+
+    Cwd = rebar_state:dir(State),
+    %% If there are more source files, make sure we end the CDB entry
+    %% with a comma.
+    Sep = case SrcRest of
+              [] -> "~n";
+              _  -> ",~n"
+          end,
+    %% CDB entry
+    lists:flatten(
+      io_lib:format(
+        "{ \"file\"      : ~p~n"
+        ", \"directory\" : ~p~n"
+        ", \"command\"   : ~p~n"
+        "}~s",
+        [Src, Cwd, CDBCmd, Sep])).
+
+%%
+%% Choose a compiler variable, based on a provided extension
+%%
+compiler(".cc")  -> "$CXX";
+compiler(".cp")  -> "$CXX";
+compiler(".cxx") -> "$CXX";
+compiler(".cpp") -> "$CXX";
+compiler(".CPP") -> "$CXX";
+compiler(".c++") -> "$CXX";
+compiler(".C")   -> "$CXX";
+compiler(_)      -> "$CC".
+
+expand_command(TmplName, Env, InFiles, OutFile) ->
+    Cmd0 = proplists:get_value(TmplName, Env),
+    Cmd1 = rebar_api:expand_env_variable(Cmd0, "PORT_IN_FILES", InFiles),
+    OutFile1 =
+        case re:run(OutFile, " ") of
+            nomatch -> OutFile;
+            _ -> lists:concat(["\"", OutFile, "\""])
+        end,
+    rebar_api:expand_env_variable(Cmd1, "PORT_OUT_FILE", OutFile1).
+
+exec_compiler(_Config, Source, Cmd, ShOpts) ->
+    case rebar_utils:sh(Cmd, ShOpts) of
+        {error, {_RC, RawError}} ->
+            AbsSource = filename:absname(Source),
+            rebar_api:info("Compiling ~ts", [AbsSource]),
+            Error = re:replace(RawError, Source, AbsSource,
+                               [{return, list}, global, unicode]),
+            rebar_api:error("~ts", [Error]),
+            rebar_api:abort();
+        {ok, Output} ->
+            rebar_api:info("Compiling ~ts", [Source]),
+            rebar_api:debug("~ts", [Output])
+    end.
+
+select_compile_template(drv, Compiler) ->
+    select_compile_drv_template(Compiler);
+select_compile_template(exe, Compiler) ->
+    select_compile_exe_template(Compiler).
+
+select_compile_drv_template("$CC")  -> "DRV_CC_TEMPLATE";
+select_compile_drv_template("$CXX") -> "DRV_CXX_TEMPLATE".
+
+select_compile_exe_template("$CC")  -> "EXE_CC_TEMPLATE";
+select_compile_exe_template("$CXX") -> "EXE_CXX_TEMPLATE".
+
+needs_compile(Source, Bin) ->
+    needs_link(Bin, [Source|bin_deps(Bin)]).
+
+%% NOTE: This relies on -MMD being passed to the compiler and returns an
+%% empty list if the .d file is not available.  This means header deps are
+%% ignored on win32.
+bin_deps(Bin) ->
+    [DepFile] = port_deps([Bin]),
+    case file:read_file(DepFile) of
+        {ok, Deps} ->
+            parse_bin_deps(list_to_binary(Bin), Deps);
+        {error, _Err} ->
+            []
+    end.
+
+parse_bin_deps(Bin, Deps) ->
+    Ds = re:split(Deps, "\\s*\\\\\\R\\s*|\\s+", [{return, binary}]),
+    [D || D <- Ds, D =/= <<>>, D =/= <<Bin/binary,":">>].
+
+%%
+%% == linking ==
+%%
+
+needs_link(SoName, []) ->
+    filelib:last_modified(SoName) == 0;
+needs_link(SoName, NewBins) ->
+    MaxLastMod = lists:max([filelib:last_modified(B) || B <- NewBins]),
+    case filelib:last_modified(SoName) of
+        0 ->
+            true;
+        Other ->
+            MaxLastMod >= Other
+    end.
+
+select_link_template(LinkLang, Target) ->
+    case {LinkLang, pc_util:target_type(Target)} of
+        {cc,  drv} -> "DRV_LINK_TEMPLATE";
+        {cxx, drv} -> "DRV_LINK_CXX_TEMPLATE";
+        {cc,  exe} -> "EXE_LINK_TEMPLATE";
+        {cxx, exe} -> "EXE_LINK_CXX_TEMPLATE"
+    end.

guam-0.9.12.tar.gz/_checkouts/pc/src/pc_port_env.erl Added

@@ -0,0 +1,316 @@
+%% -------------------------------------------------------------------
+%%
+%% This file contains substantial portions of the original rebar_port_compiler.
+%% Special thanks to all the folks that contributed to that effort.
+%%
+%% -------------------------------------------------------------------
+%%
+%% Copyright (c) 2009 Dave Smith (dizzyd@dizzyd.com)
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+%%
+%% -------------------------------------------------------------------
+-module(pc_port_env).
+
+-export([construct/1, construct/2]).
+-export_type([]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+construct(State) ->
+    construct(State, []).
+
+-spec construct(rebar_state:t()) -> {ok, [pc_port_specs:spec()]} |
+                                    {error, Reason :: any()}.
+construct(State, ExtraEnv) ->
+    DefaultEnv  = filter_env(default_env()),
+    PortEnv     = filter_env(rebar_state:get(State, port_env, [])),
+    OverrideEnv = PortEnv ++ ExtraEnv,
+
+    RawEnv = apply_defaults(os_env(), DefaultEnv) ++ OverrideEnv,
+    {ok, expand_vars_loop(merge_each_var(RawEnv))}.
+
+%%%===================================================================
+%%% Internal Functions
+%%%===================================================================
+
+%%
+%% Given a list of {Key, Value} environment variables, where Key may be defined
+%% multiple times, walk the list and expand each self-reference so that we
+%% end with a list of each variable singly-defined.
+%%
+merge_each_var(Vars) ->
+    lists:foldl(fun ({Key, Value}, Acc) ->
+                        Evalue = case orddict:find(Key, Acc) of
+                                     error ->
+                                         %% Nothing yet defined for this key/value.
+                                         %% Expand any self-references as blank.
+                                         rebar_api:expand_env_variable(Value, Key, "");
+                                     {ok, Value0} ->
+                                         %% Use previous definition in expansion
+                                         rebar_api:expand_env_variable(Value, Key, Value0)
+                                 end,
+                        orddict:store(Key, Evalue, Acc)
+                end, [], Vars).
+
+%%
+%% Give a unique list of {Key, Value} environment variables, expand each one
+%% for every other key until no further expansions are possible.
+%%
+expand_vars_loop(Vars) ->
+    expand_vars_loop(Vars, [], dict:from_list(Vars), 10).
+
+expand_vars_loop(_Pending, _Recurse, _Vars, 0) ->
+    rebar_api:abort("Max. expansion reached for ENV vars!\n", []);
+expand_vars_loop([], [], Vars, _Count) ->
+    lists:keysort(1, dict:to_list(Vars));
+expand_vars_loop([], Recurse, Vars, Count) ->
+    expand_vars_loop(Recurse, [], Vars, Count-1);
+expand_vars_loop([{K, V} | Rest], Recurse, Vars, Count) ->
+    %% Identify the variables that need expansion in this value
+    ReOpts = [global, {capture, all_but_first, list}, unicode],
+    case re:run(V, "\\\${?(\\w+)}?", ReOpts) of
+        {match, Matches} ->
+            %% Identify the unique variables that need to be expanded
+            UniqueMatches = lists:usort([M || [M] <- Matches]),
+
+            %% For each variable, expand it and return the final
+            %% value. Note that if we have a bunch of unresolvable
+            %% variables, nothing happens and we don't bother
+            %% attempting further expansion
+            case expand_keys_in_value(UniqueMatches, V, Vars) of
+                V ->
+                    %% No change after expansion; move along
+                    expand_vars_loop(Rest, Recurse, Vars, Count);
+                Expanded ->
+                    %% Some expansion occurred; move to next k/v but
+                    %% revisit this value in the next loop to check
+                    %% for further expansion
+                    NewVars = dict:store(K, Expanded, Vars),
+                    expand_vars_loop(Rest, [{K, Expanded} | Recurse],
+                                     NewVars, Count)
+            end;
+
+        nomatch ->
+            %% No values in this variable need expansion; move along
+            expand_vars_loop(Rest, Recurse, Vars, Count)
+    end.
+
+expand_keys_in_value([], Value, _Vars) ->
+    Value;
+expand_keys_in_value([Key | Rest], Value, Vars) ->
+    NewValue = case dict:find(Key, Vars) of
+                   {ok, KValue} ->
+                       rebar_api:expand_env_variable(Value, Key, KValue);
+                   error ->
+                       Value
+               end,
+    expand_keys_in_value(Rest, NewValue, Vars).
+
+%%
+%% Filter a list of env vars such that only those which match the provided
+%% architecture regex (or do not have a regex) are returned.
+%%
+filter_env(Env) ->
+    Res = lists:foldl(fun
+                          ({ArchRegex, Key, Value}, Acc) ->
+                             case pc_util:is_arch(ArchRegex) of
+                                 true -> [{Key,Value} | Acc];
+                                 false -> Acc
+                             end;
+                          ({Key,Value}, Acc) ->
+                             [{Key,Value} | Acc]
+                     end, [], Env),
+    lists:reverse(Res).
+
+%%
+%% Given a list of {Key, Value} variables, and another list of default
+%% {Key, Value} variables, return a merged list where the rule is if the
+%% default is expandable expand it with the value of the variable list,
+%% otherwise just return the value of the variable.
+%%
+apply_defaults(Vars, Defaults) ->
+    dict:to_list(
+      dict:merge(fun(Key, VarValue, DefaultValue) ->
+                         case is_expandable(DefaultValue) of
+                             true ->
+                                 rebar_api:expand_env_variable(DefaultValue,
+                                                               Key,
+                                                               VarValue);
+                             false -> VarValue
+                         end
+                 end,
+                 dict:from_list(Vars),
+                 dict:from_list(Defaults))).
+
+os_env() ->
+    ReOpts = [{return, list}, {parts, 2}, unicode],
+    Os = [list_to_tuple(re:split(S, "=", ReOpts)) ||
+             S <- lists:filter(fun discard_deps_vars/1, os:getenv())],
+    %% Drop variables without a name (win32)
+    [T1 || {K, _V} = T1 <- Os, K =/= []].
+
+%%
+%% To avoid having multiple repetitions of the same environment variables
+%% (ERL_LIBS), avoid exporting any variables that may cause conflict with
+%% those exported by the rebar_deps module (ERL_LIBS, REBAR_DEPS_DIR)
+%%
+discard_deps_vars("ERL_LIBS=" ++ _Value)       -> false;
+discard_deps_vars("REBAR_DEPS_DIR=" ++ _Value) -> false;
+discard_deps_vars(_Var)                        -> true.
+
+%%
+%% Given a string, determine if it is expandable
+%%
+is_expandable(InStr) ->
+    case re:run(InStr,"\\\$",[{capture,none}]) of
+        match -> true;
+        nomatch -> false
+    end.
+
+erl_interface_dir(Subdir) ->
+    case code:lib_dir(erl_interface, Subdir) of
+        {error, bad_name} ->
+            throw({error, {erl_interface,Subdir,"code:lib_dir(erl_interface)"
+                           "is unable to find the erl_interface library."}});
+        Dir -> Dir
+    end.
+
+erts_dir() ->
+    lists:concat([code:root_dir(), "/erts-", erlang:system_info(version)]).
+
+default_env() ->
+    ErlInterfaceIncludeDir = erl_interface_dir(include),
+    ErlInterfaceHeader = filename:join(ErlInterfaceIncludeDir, "erl_interface.h"),
+    ErlInterfaceLibs = case filelib:is_file(ErlInterfaceHeader) of
+                           true -> ["erl_interface", "ei"];
+                           false -> ["ei"]
+                       end,
+    Arch = os:getenv("REBAR_TARGET_ARCH"),
+    Vsn = os:getenv("REBAR_TARGET_ARCH_VSN"),
+    [
+     {"CC", get_tool(Arch, Vsn, "gcc", "cc")},
+     {"CXX", get_tool(Arch, Vsn, "g++", "c++")},
+     {"AR", get_tool(Arch, "ar", "ar")},
+     {"AS", get_tool(Arch, "as", "as")},
+     {"CPP", get_tool(Arch, Vsn, "cpp", "cpp")},
+     {"LD", get_tool(Arch, "ld", "ld")},
+     {"RANLIB", get_tool(Arch, Vsn, "ranlib", "ranlib")},
+     {"STRIP", get_tool(Arch, "strip", "strip")},
+     {"NM", get_tool(Arch, "nm", "nm")},
+     {"OBJCOPY", get_tool(Arch, "objcopy", "objcopy")},
+     {"OBJDUMP", get_tool(Arch, "objdump", "objdump")},
+
+     {"DRV_CXX_TEMPLATE",
+      "$CXX -c $CXXFLAGS $DRV_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
+     {"DRV_CC_TEMPLATE",
+      "$CC -c $CFLAGS $DRV_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
+     {"DRV_LINK_TEMPLATE",
+      "$CC $PORT_IN_FILES $LDFLAGS $LDLIBS $DRV_LDFLAGS -o $PORT_OUT_FILE"},
+     {"DRV_LINK_CXX_TEMPLATE",
+      "$CXX $PORT_IN_FILES $LDFLAGS $LDLIBS $DRV_LDFLAGS -o $PORT_OUT_FILE"},
+     {"EXE_CXX_TEMPLATE",
+      "$CXX -c $CXXFLAGS $EXE_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
+     {"EXE_CC_TEMPLATE",
+      "$CC -c $CFLAGS $EXE_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
+     {"EXE_LINK_TEMPLATE",
+      "$CC $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS -o $PORT_OUT_FILE"},
+     {"EXE_LINK_CXX_TEMPLATE",
+      "$CXX $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS -o $PORT_OUT_FILE"},
+     {"DRV_CFLAGS" , "-g -Wall -fPIC -MMD $ERL_CFLAGS"},
+     {"DRV_LDFLAGS", "-shared $ERL_LDFLAGS"},
+     {"EXE_CFLAGS" , "-g -Wall -fPIC -MMD $ERL_CFLAGS"},
+     {"EXE_LDFLAGS", "$ERL_LDFLAGS"},
+
+     {"ERL_CFLAGS", lists:concat(
+                      [
+                       " -I\"", ErlInterfaceIncludeDir,
+                       "\" -I\"", filename:join(erts_dir(), "include"),
+                       "\" "
+                      ])},
+     {"ERL_EI_LIBDIR", lists:concat(["\"", erl_interface_dir(lib), "\""])},
+     {"ERL_LDFLAGS"  , lists:concat([" -L$ERL_EI_LIBDIR"] ++
+                                    [" -l"++EiLib || EiLib <- ErlInterfaceLibs])},
+     {"ERLANG_ARCH"  , rebar_api:wordsize()},
+     {"ERLANG_TARGET", rebar_api:get_arch()},
+
+     {"darwin", "DRV_LDFLAGS",
+      "-bundle -flat_namespace -undefined suppress $ERL_LDFLAGS"},
+
+     %% Solaris specific flags
+     {"solaris.*-64$", "CFLAGS", "-D_REENTRANT -m64 $CFLAGS"},
+     {"solaris.*-64$", "CXXFLAGS", "-D_REENTRANT -m64 $CXXFLAGS"},
+     {"solaris.*-64$", "LDFLAGS", "-m64 $LDFLAGS"},
+
+     %% OS X Leopard flags for 64-bit
+     {"darwin9.*-64$", "CFLAGS", "-m64 $CFLAGS"},
+     {"darwin9.*-64$", "CXXFLAGS", "-m64 $CXXFLAGS"},
+     {"darwin9.*-64$", "LDFLAGS", "-arch x86_64 -flat_namespace -undefined suppress $LDFLAGS"},
+
+     %% OS X Lion onwards flags for 64-bit
+     {"darwin1[0-4].*-64$", "CFLAGS", "-m64 $CFLAGS"},
+     {"darwin1[0-4].*-64$", "CXXFLAGS", "-m64 $CXXFLAGS"},
+     {"darwin1[0-4].*-64$", "LDFLAGS", "-arch x86_64 -flat_namespace -undefined suppress $LDFLAGS"},
+
+     %% OS X Snow Leopard, Lion, and Mountain Lion flags for 32-bit
+     {"darwin1[0-2].*-32", "CFLAGS", "-m32 $CFLAGS"},
+     {"darwin1[0-2].*-32", "CXXFLAGS", "-m32 $CXXFLAGS"},
+     {"darwin1[0-2].*-32", "LDFLAGS", "-arch i386 -flat_namespace -undefined suppress $LDFLAGS"},
+
+     %% Windows specific flags
+     %% add MS Visual C++ support to rebar on Windows
+     {"win32", "CC", "cl.exe"},
+     {"win32", "CXX", "cl.exe"},
+     {"win32", "LINKER", "link.exe"},
+     {"win32", "DRV_CXX_TEMPLATE",
+      %% DRV_* and EXE_* Templates are identical
+      "$CXX /c $CXXFLAGS $DRV_CFLAGS $PORT_IN_FILES /Fo$PORT_OUT_FILE"},
+     {"win32", "DRV_CC_TEMPLATE",
+      "$CC /c $CFLAGS $DRV_CFLAGS $PORT_IN_FILES /Fo$PORT_OUT_FILE"},
+     {"win32", "DRV_LINK_TEMPLATE",
+      "$LINKER $PORT_IN_FILES $LDFLAGS $DRV_LDFLAGS /OUT:$PORT_OUT_FILE"},
+     {"win32", "DRV_LINK_CXX_TEMPLATE",
+      "$LINKER $PORT_IN_FILES $LDFLAGS $DRV_LDFLAGS /OUT:$PORT_OUT_FILE"},
+     %% DRV_* and EXE_* Templates are identical
+     {"win32", "EXE_CXX_TEMPLATE",
+      "$CXX /c $CXXFLAGS $EXE_CFLAGS $PORT_IN_FILES /Fo$PORT_OUT_FILE"},
+     {"win32", "EXE_CC_TEMPLATE",
+      "$CC /c $CFLAGS $EXE_CFLAGS $PORT_IN_FILES /Fo$PORT_OUT_FILE"},
+     {"win32", "EXE_LINK_TEMPLATE",
+      "$LINKER $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS /OUT:$PORT_OUT_FILE"},
+     {"win32", "EXE_LINK_CXX_TEMPLATE",
+      "$LINKER $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS /OUT:$PORT_OUT_FILE"},
+     %% ERL_CFLAGS are ok as -I even though strictly it should be /I
+     {"win32", "ERL_LDFLAGS",
+      lists:concat([" /LIBPATH:$ERL_EI_LIBDIR "] ++
+                    [EiLib++".lib " || EiLib <- ErlInterfaceLibs])},
+     {"win32", "DRV_CFLAGS", "/Zi /Wall $ERL_CFLAGS"},
+     {"win32", "DRV_LDFLAGS", "/DLL $ERL_LDFLAGS"}
+    ].
+
+get_tool(Arch, Tool, Default) ->
+    get_tool(Arch, false, Tool, Default).
+
+get_tool(false, _, _, Default) -> Default;
+get_tool("", _, _, Default) -> Default;
+get_tool(Arch, false, Tool, _Default) -> Arch++"-"++Tool;
+get_tool(Arch, "", Tool, _Default) -> Arch++"-"++Tool;
+get_tool(Arch, Vsn, Tool, _Default) -> Arch++"-"++Tool++"-"++Vsn.

guam-0.9.12.tar.gz/_checkouts/pc/src/pc_port_specs.erl Added

@@ -0,0 +1,253 @@
+%% -------------------------------------------------------------------
+%%
+%% This file contains substantial portions of the original rebar_port_compiler.
+%% Special thanks to all the folks that contributed to that effort.
+%%
+%% -------------------------------------------------------------------
+%%
+%% Copyright (c) 2009 Dave Smith (dizzyd@dizzyd.com)
+%%
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
+%%
+%% The above copyright notice and this permission notice shall be included in
+%% all copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+%% THE SOFTWARE.
+%%
+%% -------------------------------------------------------------------
+-module(pc_port_specs).
+
+-export([
+         construct/1,
+         create_env/2,
+         %% spec accessors
+         environment/1,
+         opts/1,
+         objects/1,
+         sources/1,
+         target/1,
+         type/1,
+         link_lang/1,
+         object_file_ext/0
+        ]).
+-export_type([spec/0]).
+
+-record(spec, {type::'drv' | 'exe',
+               link_lang::'cc' | 'cxx',
+               target::file:filename(),
+               sources = [] :: [file:filename(), ...],
+               objects = [] :: [file:filename(), ...],
+               opts = [] :: list() | []}).
+
+-opaque spec() :: #spec{}.
+
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+-spec construct(rebar_state:t()) -> {ok, [spec()]} |
+                                    {error, Reason :: any()}.
+construct(State) ->
+    case rebar_state:get(State, port_specs, []) of
+        [] ->
+            {ok, [port_spec_from_legacy(State)]};
+        PortSpecs ->
+            Filtered = lists:filter(fun filter_port_spec/1, PortSpecs),
+            Specs = [get_port_spec(State, os:type(), Spec) || Spec <- Filtered],
+            {ok, [S || S <- Specs, S#spec.sources /= []]}
+    end.
+
+create_env(State, Spec) ->
+    pc_port_specs:environment(Spec) ++
+        try_and_create_env(State).
+
+%% == Spec Accessors ==
+
+environment(#spec{opts = Opts})        -> proplists:get_value(env, Opts).
+opts(#spec{opts = Opts})               -> Opts.
+objects(#spec{objects = Objects})      -> Objects.
+sources(#spec{sources = Sources})      -> Sources.
+target(#spec{target = Target})         -> Target.
+type(#spec{type = Type})               -> Type.
+link_lang(#spec{link_lang = LinkLang}) -> LinkLang.
+
+%%%===================================================================
+%%% Internal Functions
+%%%===================================================================
+
+try_and_create_env(State) ->
+    _ = code:ensure_loaded(rebar_env),
+    case erlang:function_exported(rebar_env, create_env, 1) of
+        false -> [];
+        true -> rebar_env:create_env(State)
+    end.
+
+port_spec_from_legacy(Config) ->
+    %% Get the target from the so_name variable
+    OutDir = case os:getenv("REBAR_BARE_COMPILER_OUTPUT_DIR", undefined) of
+                 undefined ->
+                     "priv";
+                 Dir ->
+                     filename:join(Dir, "priv")
+             end,
+    Target = case rebar_state:get(Config, so_name, undefined) of
+                 undefined ->
+                     %% Generate a sensible default from app file
+                     AppName = case rebar_state:current_app(Config) of
+                                      undefined ->
+                                          throw({error, {pc_prv_compile, no_app}});
+                                      CurrentApp ->
+                                          BAppName = rebar_app_info:name(CurrentApp),
+                                          binary_to_list(BAppName)
+                                  end,
+                     filename:join(OutDir, lists:concat([AppName, "_drv.so"]));
+                 AName ->
+                     filename:join(OutDir, AName)
+             end,
+
+    %% Get the list of source files from port_sources
+    Sources = port_sources(rebar_state:dir(Config), rebar_state:get(Config, port_sources, ["c_src/*.c"])),
+    #spec { type = pc_util:target_type(Target),
+            link_lang = cc,
+            target = maybe_switch_extension(os:type(), Target),
+            sources = Sources,
+            objects = port_objects(Sources),
+            opts    = [port_opt(Config, O) || O <- fill_in_defaults([])]}.
+
+maybe_report_wc(Source, Found) ->
+    case Found of
+        [] ->
+            rebar_api:warn("Found no source files for:~n~p", [Source]);
+        _ ->
+            ok
+    end,
+    Found.
+
+wildcard(Source, WorkDir) ->
+    maybe_report_wc(Source, filelib:wildcard(Source, WorkDir)).
+
+port_sources(WorkDir, Sources) ->
+    lists:flatmap(fun (Source) ->
+                      wildcard(Source, WorkDir)
+                  end, Sources).
+
+maybe_switch_extension({win32, nt}, Target) ->
+    switch_to_dll_or_exe(Target);
+maybe_switch_extension(_OsType, Target) ->
+    Target.
+
+port_objects(SourceFiles) ->
+    Ext = object_file_ext(),
+    [pc_util:replace_extension(O, Ext) || O <- SourceFiles].
+
+filter_port_spec({ArchRegex, _, _, _}) ->
+    pc_util:is_arch(ArchRegex);
+filter_port_spec({ArchRegex, _, _}) ->
+    pc_util:is_arch(ArchRegex);
+filter_port_spec({_, _}) ->
+    true.
+
+get_port_spec(Config, OsType, {Target, Sources}) ->
+    get_port_spec(Config, OsType, {undefined, Target, Sources, []});
+get_port_spec(Config, OsType, {Arch, Target, Sources}) ->
+    get_port_spec(Config, OsType, {Arch, Target, Sources, []});
+get_port_spec(Config, OsType, {_Arch, Target, Sources, Opts}) ->
+    Env = try_and_create_env(Config),
+    ProjectRoot = rebar_state:dir(Config),
+    SourceFiles =
+        lists:flatmap(
+          fun(Source) ->
+                  wildcard(expand_env(Source, Env), rebar_state:dir(Config))
+          end, Sources),
+    LinkLang =
+        case lists:any(
+               fun(Src) ->
+                       pc_compilation:compiler(filename:extension(Src)) == "$CXX"
+               end,
+               SourceFiles)
+        of
+            true  -> cxx;
+            false -> cc
+        end,
+   
+    Target1 =
+        case os:getenv("REBAR_BARE_COMPILER_OUTPUT_DIR", undefined) of
+            undefined ->
+                filename:join(ProjectRoot, Target);
+            Dir -> 
+                filename:join([Dir, Target])
+        end,
+    #spec{type      = pc_util:target_type(Target1),
+          target    = coerce_extension(OsType, Target1),
+          link_lang = LinkLang,
+          sources   = SourceFiles,
+          objects   = port_objects(SourceFiles),
+          opts      = [port_opt(Config, O) || O <- fill_in_defaults(Opts)]}.
+
+expand_env(Source, Env) ->
+    case pc_util:strchr(Source, $$) of
+        0 ->
+            %% No variables to expand. Also hides undef on older rebar3.
+            Source;
+        _ ->
+            lists:foldl(
+              fun({Key, Value}, Acc) ->
+                      %% TODO: the expand_env_variable/3 only expands
+                      %% variables delimited by whitespace and inside
+                      %% ${}. Either fix or add a new function to
+                      %% rebar3 or make a new function here in pc.
+                      rebar_utils:expand_env_variable(Acc, Key, Value)
+              end, Source, Env)
+    end.
+
+coerce_extension({win32, nt}, Target) ->
+    switch_to_dll_or_exe(Target);
+coerce_extension(_OsType, Target) ->
+    Target.
+
+switch_to_dll_or_exe(Target) ->
+    case filename:extension(Target) of
+        ".so"  -> filename:rootname(Target, ".so") ++ ".dll";
+        []     -> Target ++ ".exe";
+        _Other -> Target
+    end.
+
+%% NOTE: By ensuring that the options list has default values we can simplify
+%% the implementation of the compilation module. More invariants means less
+%% lookups and/or branching.
+%%
+%% It might make sense to move 'env' into the top-level of the record. That's an
+%% option too.
+fill_in_defaults(Opts) ->
+    %% insert an {env, []} if {env, _} does not exist
+    case lists:any(fun ({env, _}) -> true;
+                       (_)        -> false end, Opts) of
+        true ->
+            Opts;
+        false ->
+            [{env, []} | Opts]
+    end.
+
+port_opt(State, {env, Env}) ->
+    {ok, PortEnv} = pc_port_env:construct(State, Env),
+    {env, PortEnv};
+port_opt(_State, Opt) ->
+    Opt.
+
+object_file_ext() ->
+    case os:type() of
+        {win32,_} -> ".obj";
+        _         -> ".o"
+    end.

guam-0.9.12.tar.gz/_checkouts/pc/src/pc_prv_clean.erl Added

@@ -0,0 +1,51 @@
+%% -------------------------------------------------------------------
+%%
+%% rebar3 port compiler cleaner, in the manner of rebar2.
+%%
+%% -------------------------------------------------------------------
+-module(pc_prv_clean).
+-behaviour(provider).
+
+-export([init/1, do/1, format_error/1]).
+
+-define(NAMESPACE, pc).
+-define(PROVIDER, clean).
+-define(DEPS, [{default, app_discovery}]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+    Provider = providers:create([
+                                 {name, ?PROVIDER},             %% The 'user friendly' name of the task
+                                 {module, ?MODULE},             %% The module implementation of the task
+                                 {bare, true},                  %% The task can be run by the user, always true
+                                 {deps, ?DEPS},                 %% The list of dependencies
+                                 {example, "rebar pc clean"},   %% How to use the plugin
+                                 {opts, []},                    %% list of options understood by the plugin
+                                 {short_desc, "clean the results of port compilation"},
+                                 {desc, ""},
+                                 {namespace, pc}
+                                ]),
+    {ok, rebar_state:add_provider(State, Provider)}.
+
+
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do(State) ->
+    Cwd = rebar_state:dir(State),
+    Providers = rebar_state:providers(State),
+    rebar_hooks:run_all_hooks(
+      Cwd, pre, {?NAMESPACE, ?PROVIDER}, Providers, State),
+
+    {ok, PortSpecs} = pc_port_specs:construct(State),
+    ok = pc_compilation:clean(State, PortSpecs),
+
+    rebar_hooks:run_all_hooks(
+      Cwd, post, {?NAMESPACE, ?PROVIDER}, Providers, State),
+    {ok, State}.
+
+-spec format_error(any()) ->  iolist().
+format_error(Reason) ->
+    io_lib:format("~p", [Reason]).

guam-0.9.12.tar.gz/_checkouts/pc/src/pc_prv_compile.erl Added

@@ -0,0 +1,65 @@
+%% -------------------------------------------------------------------
+%%
+%% rebar3 port compiler, in the manner of rebar2.
+%%
+%% -------------------------------------------------------------------
+-module(pc_prv_compile).
+-behaviour(provider).
+
+-export([init/1, do/1, format_error/1]).
+
+-define(NAMESPACE, pc).
+-define(PROVIDER, compile).
+-define(DEPS, [{default, compile}]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+    Provider = providers:create([
+                                 {name, ?PROVIDER},             %% The 'user friendly' name of the task
+                                 {module, ?MODULE},             %% The module implementation of the task
+                                 {bare, true},                  %% The task can be run by the user, always true
+                                 {deps, ?DEPS},                 %% The list of dependencies
+                                 {example, "rebar pc compile"}, %% How to use the plugin
+                                 {opts, []},                    %% list of options understood by the plugin
+                                 {short_desc, "perform port compilation"},
+                                 {desc, ""},
+                                 {namespace, pc}
+                                ]),
+    {ok, rebar_state:add_provider(State, Provider)}.
+
+
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do(State) ->
+    Apps = case rebar_state:current_app(State) of
+               undefined ->
+                   rebar_state:project_apps(State);
+               AppInfo ->
+                   [AppInfo]
+           end,
+
+    Cwd = rebar_state:dir(State),
+    Providers = rebar_state:providers(State),
+    rebar_hooks:run_all_hooks(
+      Cwd, pre, {?NAMESPACE, ?PROVIDER}, Providers, State),
+
+    [begin
+         Opts = rebar_app_info:opts(AppInfo1),
+         State1 = rebar_state:opts(State, Opts),
+         {ok, PortSpecs} = pc_port_specs:construct(State1),
+         ok = pc_compilation:compile_and_link(State1, PortSpecs)
+     end || AppInfo1 <- Apps],
+
+    rebar_hooks:run_all_hooks(
+      Cwd, post, {?NAMESPACE, ?PROVIDER}, Providers, State),
+
+    {ok, State}.
+
+-spec format_error(any()) ->  iolist().
+format_error(no_app) ->
+    io_lib:format("No so_name or application defined.", []);
+format_error(Reason) ->
+    io_lib:format("~p", [Reason]).

guam-0.9.12.tar.gz/_checkouts/pc/src/pc_util.erl Added

@@ -0,0 +1,232 @@
+-module(pc_util).
+
+-export([ replace_extension/2
+        , replace_extension/3
+        , target_type/1
+        , get_arch/0
+        , wordsize/0
+        , is_arch/1
+        , strtok/2
+        , strjoin/2
+        , strchr/2
+        ]).
+-export_type([]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+replace_extension(File, NewExt) ->
+    OldExt = filename:extension(File),
+    replace_extension(File, OldExt, NewExt).
+replace_extension(File, OldExt, NewExt) ->
+    filename:rootname(File, OldExt) ++ NewExt.
+
+target_type(Target)  -> target_type1(filename:extension(Target)).
+target_type1(".so")  -> drv;
+target_type1(".dll") -> drv;
+target_type1("")     -> exe;
+target_type1(".exe") -> exe.
+
+is_arch(ArchRegex) ->
+    case re:run(get_arch(), ArchRegex, [{capture, none}]) of
+        match ->
+            true;
+        nomatch ->
+            false
+    end.
+
+%%
+%% REBAR_TARGET_ARCH, if used, should be set to the "standard"
+%% target string. That is a prefix for binutils tools.
+%% "x86_64-linux-gnu" or "arm-linux-gnueabi" are good candidates
+%% ${REBAR_TARGET_ARCH}-gcc, ${REBAR_TARGET_ARCH}-ld ...
+%%
+get_arch() ->
+    Arch = os:getenv("REBAR_TARGET_ARCH"),
+    Words = wordsize(Arch),
+    rebar_utils:otp_release() ++ "-" ++ get_system_arch(Arch) ++ "-" ++ Words.
+
+get_system_arch(Arch) when Arch =:= false; Arch =:= "" ->
+    erlang:system_info(system_architecture);
+get_system_arch(Arch) ->
+    Arch.
+
+wordsize() ->
+    wordsize(os:getenv("REBAR_TARGET_ARCH")).
+
+%%%===================================================================
+%%% Internal Functions
+%%%===================================================================
+
+wordsize(Arch) when Arch =:= false; Arch =:= "" ->
+    native_wordsize();
+wordsize(Arch) ->
+    AllArchs = [
+                {"i686","32"},
+                {"i386","32"},
+                {"arm","32"},
+                {"aarch64", "64"},
+                {"x86_64","64"}
+               ],
+    case match_wordsize(Arch, AllArchs) of
+        false ->
+            case cross_wordsize(Arch) of
+                "" ->
+                    env_wordsize(os:getenv("REBAR_TARGET_ARCH_WORDSIZE"));
+                WordSize ->
+                    WordSize
+            end;
+        {_, Wordsize} ->
+            Wordsize
+    end.
+
+match_wordsize(Arch, [V={Match,_Bits}|Vs]) ->
+    case re:run(Arch, Match, [{capture, none}]) of
+        match ->
+            V;
+        nomatch ->
+            match_wordsize(Arch, Vs)
+    end;
+match_wordsize(_Arch, []) ->
+    false.
+
+env_wordsize(Wordsize) when Wordsize =:= false;
+                            Wordsize =:= "" ->
+    rebar_log:log(
+      warn, "REBAR_TARGET_ARCH_WORDSIZE not set, assuming 32\n", []),
+    "32";
+env_wordsize(Wordsize) ->
+    case Wordsize of
+        "16" -> Wordsize;
+        "32" -> Wordsize;
+        "64" -> Wordsize;
+        _ ->
+            rebar_log:log(
+              warn, "REBAR_TARGET_ARCH_WORDSIZE bad value: ~p\n", [Wordsize]),
+            "32"
+    end.
+
+%%
+%% Find out the word size of the target by using Arch-gcc
+%%
+cross_wordsize(Arch) ->
+    cross_sizeof(Arch, "void*").
+
+%%
+%% Find the size of target Type using a specially crafted C file
+%% that will report an error on the line of the byte size of the type.
+%%
+cross_sizeof(Arch, Type) ->
+    Compiler = if Arch =:= "" -> "cc";
+                  true -> Arch ++ "-gcc"
+               end,
+    TempFile = mktempfile(".c"),
+    ok = file:write_file(TempFile,
+                         <<"int t01 [1 - 2*(((long) (sizeof (TYPE))) == 1)];\n"
+                           "int t02 [1 - 2*(((long) (sizeof (TYPE))) == 2)];\n"
+                           "int t03 [1 - 2*(((long) (sizeof (TYPE))) == 3)];\n"
+                           "int t04 [1 - 2*(((long) (sizeof (TYPE))) == 4)];\n"
+                           "int t05 [1 - 2*(((long) (sizeof (TYPE))) == 5)];\n"
+                           "int t06 [1 - 2*(((long) (sizeof (TYPE))) == 6)];\n"
+                           "int t07 [1 - 2*(((long) (sizeof (TYPE))) == 7)];\n"
+                           "int t08 [1 - 2*(((long) (sizeof (TYPE))) == 8)];\n"
+                           "int t09 [1 - 2*(((long) (sizeof (TYPE))) == 9)];\n"
+                           "int t10 [1 - 2*(((long) (sizeof (TYPE))) == 10)];\n"
+                           "int t11 [1 - 2*(((long) (sizeof (TYPE))) == 11)];\n"
+                           "int t12 [1 - 2*(((long) (sizeof (TYPE))) == 12)];\n"
+                           "int t13 [1 - 2*(((long) (sizeof (TYPE))) == 13)];\n"
+                           "int t14 [1 - 2*(((long) (sizeof (TYPE))) == 14)];\n"
+                           "int t15 [1 - 2*(((long) (sizeof (TYPE))) == 15)];\n"
+                           "int t16 [1 - 2*(((long) (sizeof (TYPE))) == 16)];\n"
+                         >>),
+    Cmd = Compiler ++ " -DTYPE=\""++Type++"\" " ++ TempFile,
+    ShOpts = [{use_stdout, false}, return_on_error],
+    {error, {_,Res}} = rebar_utils:sh(Cmd, ShOpts),
+    ok = file:delete(TempFile),
+    case strtok(Res, ":") of
+        [_, Ln | _] ->
+            try list_to_integer(Ln) of
+                NumBytes -> integer_to_list(NumBytes*8)
+            catch
+                error:_ ->
+                    ""
+            end;
+        _ ->
+            ""
+    end.
+
+strtok(Str, SepList) ->
+    case erlang:function_exported(string, lexemes, 2) of
+        true -> string:lexemes(Str, SepList);
+        false -> apply(string, tokens, [Str, SepList])
+    end.
+
+%% Lifted lists:join/2 from OTP-19 to use with OTP-17 and OTP-18.
+%% TODO: remove when pc requires OTP >=19.
+lists_join(Sep, L) ->
+    case erlang:function_exported(lists, join, 2) of
+        true -> lists:join(Sep, L);
+        false -> lists_join1(Sep, L)
+    end.
+
+lists_join1(_Sep, []) -> [];
+lists_join1(Sep, [H|T]) -> [H|lists_join1_prepend(Sep, T)].
+
+lists_join1_prepend(_Sep, []) -> [];
+lists_join1_prepend(Sep, [H|T]) -> [Sep,H|lists_join1_prepend(Sep,T)].
+
+strjoin(L, Sep) ->
+    lists:flatten(lists_join(Sep, L)).
+
+strchr(S, C) when is_integer(C) -> strchr(S, C, 1).
+strchr([C|_Cs], C, I) -> I;
+strchr([_|Cs], C, I) -> strchr(Cs, C, I+1);
+strchr([], _C, _I) -> 0.
+
+mktempfile(Suffix) ->
+    {A,B,C} = rebar_now(),
+    Dir = temp_dir(),
+    File = "rebar_"++os:getpid()++
+        integer_to_list(A)++"_"++
+        integer_to_list(B)++"_"++
+        integer_to_list(C)++Suffix,
+    filename:join(Dir, File).
+
+temp_dir() ->
+    case os:type() of
+        {win32, _} -> windows_temp_dir();
+        _ -> "/tmp"
+    end.
+
+windows_temp_dir() ->
+    case os:getenv("TEMP") of
+        false ->
+            case os:getenv("TMP") of
+                false -> "C:/WINDOWS/TEMP";
+                TMP -> TMP
+            end;
+        TEMP -> TEMP
+    end.
+
+rebar_now() ->
+    case erlang:function_exported(erlang, timestamp, 0) of
+        true ->
+            erlang:timestamp();
+        false ->
+            %% erlang:now/0 was deprecated in 18.0. One solution to avoid the
+            %% deprecation warning is to use
+            %% -compile({nowarn_deprecated_function, [{erlang, now, 0}]}), but
+            %% that would raise a warning in versions older than 18.0.  Calling
+            %% erlang:now/0 via apply/3 avoids that.
+            apply(erlang, now, [])
+    end.
+
+native_wordsize() ->
+    try erlang:system_info({wordsize, external}) of
+        Val ->
+            integer_to_list(8 * Val)
+    catch
+        error:badarg ->
+            integer_to_list(8 * erlang:system_info(wordsize))
+    end.

guam-0.9.11.tar.gz/apps/kolab_guam/src/kolab_guam.app.src -> guam-0.9.12.tar.gz/apps/kolab_guam/src/kolab_guam.app.src Changed

guam-0.9.11.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl -> guam-0.9.12.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl Changed

@@ -234,7 +234,7 @@
 process_lines(_Socket, State, [], ContinuationBytes, Acc) ->
     {Acc, State#state{ continuation_bytes = ContinuationBytes }};
 process_lines(Socket, State, [Line|MoreLines], 0, Acc) ->
-    { _StrippedNextLine, NextContinuationBytes } = eimap_utils:num_literal_continuation_bytes(binary:part(Line, 0, byte_size(Line)-2)),
+    { _StrippedNextLine, NextContinuationBytes, _Result } = eimap_utils:num_literal_continuation_bytes(binary:part(Line, 0, byte_size(Line)-2)),
     {NewAcc, NewState} = process_client_line(Line, Socket, State, Acc),
     process_lines(Socket, NewState, MoreLines, NextContinuationBytes, NewAcc);
 process_lines(Socket, State, [Line|MoreLines], ContinuationBytes, Acc) ->
@@ -246,20 +246,6 @@
     end,
     process_lines(Socket, State, Lines, ContinuationBytes - size(LiteralPartOfLine), <<Acc/binary, LiteralPartOfLine/binary>>).
 
-split(Lines, Data, Pattern) ->
-     case binary:match(Data, Pattern) of
-         nomatch -> {lists:reverse(Lines), Data};
-         { Start, Length } ->
-             Num = Start + Length,
-             <<Line:Num/binary, Remainder/binary>> = Data,
-             split([Line|Lines], Remainder, Pattern)
-     end.
-split(Lines, Data) ->
-    split(Lines, Data, binary:compile_pattern(<<"\r\n">>)).
-
-split_lines(Data) ->
-    split([], Data).
-
 % Client data is processed as it comes in, but split up by lines if more than one line comes in at a time.
 % The processing internally buffers data as necessary if it encounters incomplete lines.
 process_client_data(Socket, Data, #state{ inflator = Inflator, continuation_bytes = ContinuationBytes } = State) ->
@@ -267,7 +253,7 @@
     PreprocessData = preprocess_client_data(Inflator, Data, State),
     lager:debug("FROM CLIENT: ~p", [PreprocessData]),
 
-    {Lines, NewLastPartialLine} = split_lines(PreprocessData),
+    {Lines, NewLastPartialLine} = eimap_utils:split_lines(PreprocessData),
     {Acc, NewState} = process_lines(Socket, State#state{ buffered_client_data = <<>> }, Lines, ContinuationBytes, <<>>),
     #state{ buffered_client_data = DataToBuffer, continuation_bytes = NewContinuationBytes} = NewState,

guam-0.9.11.tar.gz/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl -> guam-0.9.12.tar.gz/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl Changed

@@ -77,22 +77,17 @@
 apply_if_found_kolab(0) -> true;
 apply_if_found_kolab(_) -> false.
 
-possibly_append_newline(<<>>) -> <<>> ;
-possibly_append_newline(Response) -> <<Response/binary, "\r\n">> .
-
 filter_folders(<<>>, State) ->
     { <<>>, State#state{ active = true } };
 filter_folders(Buffer, #state{ last_chunk = LeftOvers } = State) ->
     % Add the left overs from the previous buffer to the current buffer
     FullBuffer = <<LeftOvers/binary, Buffer/binary>>,
-    % From that buffer, only take the complete lines and save off the remainder.
-    { FullLinesBuffer, LastChunk } = eimap_utils:only_full_lines(FullBuffer),
-    % Create a list so we can filter the individual folders
-    ListResponses = binary:split(FullLinesBuffer, <<"\r\n">>, [ global ]),
-    { Response, More } = filter_folders(State, ListResponses, { <<>>, true }),
-    %io:format("Filtered ... ~p~n", [Response]),
-    %Note that the last list item does not contain \r\n, so that needs to be added unless we filtered the complete content.
-    { possibly_append_newline(Response), State#state { active = More, last_chunk = LastChunk } }.
+
+    {FullLines, LastChunk} = eimap_utils:split_lines_with_literals(FullBuffer),
+
+    { Response, More } = filter_folders(State, FullLines, { <<>>, true }),
+
+    {<<Response/binary>>, State#state{ active = More, last_chunk = LastChunk}}.
 
 filter_folders(_State, [], Return) -> Return;
 filter_folders(_State, _Folders, { Acc, false }) -> { Acc, false };
@@ -129,7 +124,7 @@
             { _Delimiter, Rest, _} = pop_token(binary:part(Details, Pos + 2, byte_size(Details) - Pos - 2)),
             Rest
     end,
-    { Folder, _, _ } = pop_token(list_to_binary([Suffix, <<"\r\n">>])),
+    { Folder, _, _ } = pop_token(Suffix),
 
     %% Check the folder in blacklist
     %% io:format("COMPARING ~p ??? ~p~n", [Folder, in_blacklist(Folder, Blacklist)]),
@@ -139,7 +134,7 @@
     end.
 
 add_response(Response, <<>>) -> Response;
-add_response(Response, Acc) -> <<Acc/binary, "\r\n", Response/binary>>.
+add_response(Response, Acc) -> <<Acc/binary, Response/binary>>.
 
 in_blacklist(_Folder, undefined) -> false;
 in_blacklist(_Folder, []) -> false;

guam-0.9.11.tar.gz/apps/kolab_guam/test/kolab_guam_rules_SUITE.erl -> guam-0.9.12.tar.gz/apps/kolab_guam/test/kolab_guam_rules_SUITE.erl Changed

guam-0.9.11.tar.gz/apps/kolab_guam/test/kolab_guam_session_SUITE.erl -> guam-0.9.12.tar.gz/apps/kolab_guam/test/kolab_guam_session_SUITE.erl Changed

@@ -154,6 +154,29 @@
       continuation_bytes = 0
      }} = kolab_guam_session:process_client_data(Socket, <<"\r\n">>, IntermediateState8),
 
+    % 0 length literal
+    {<<"y1 APPEND INBOX {0}\r\n\r\n">>, #state{
+      server_config = ServerConfig,
+      buffered_client_data = <<>>,
+      current_command_split = {<<"y1">>,<<"APPEND">>,<<"INBOX {0}">>},
+      command_split_reset_trigger = reset_for_next_client_command
+     }} = kolab_guam_session:process_client_data(Socket, <<"y1 APPEND INBOX {0}\r\n\r\n">>, State#state{ rules_deciding = ActiveRules }),
+
+    % 0 length literal in two lines
+    {<<"y1 APPEND INBOX {0}\r\n">>, #state{
+      server_config = ServerConfig,
+      buffered_client_data = <<>>,
+      current_command_split = {<<"y1">>,<<"APPEND">>,<<"INBOX {0}">>},
+      command_split_reset_trigger = reset_for_next_client_command
+     } = IntermediateState9} = kolab_guam_session:process_client_data(Socket, <<"y1 APPEND INBOX {0}\r\n">>, State#state{ rules_deciding = ActiveRules }),
+
+    {<<"\r\n">>, #state{
+      server_config = ServerConfig,
+      buffered_client_data = <<>>, %This ensures we aren't buffering during the continuation
+      current_command_split = {<<"y1">>,<<"APPEND">>,<<"INBOX {0}">>},
+      command_split_reset_trigger = reset_for_next_client_command,
+      continuation_bytes = 0
+     }} = kolab_guam_session:process_client_data(Socket, <<"\r\n">>, IntermediateState9),
 
     % Don't activate filtering
     {<<"y1 ID (\"name\" \"Test/KOLAB\")\r\n">>, #state{

guam-0.9.12.tar.gz/cache/rebar3/hex/hexpm/packages/pc-1.14.0.etag Added

guam-0.9.12.tar.gz/cache/rebar3/hex/hexpm/packages/pc-1.14.0.tar Added

guam-0.9.11.tar.gz/cache/rebar3/hex/packages.idx -> guam-0.9.12.tar.gz/cache/rebar3/hex/packages.idx Changed

guam-0.9.11.tar.gz/rebar.config -> guam-0.9.12.tar.gz/rebar.config Changed

@@ -10,8 +10,10 @@
 }.
 { deps, [
     lager,
-    { lager_syslog, "3.*", { git, "git://github.com/basho/lager_syslog.git", { tag, "3.0.1" } } },
-    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.4.4" } } }
+    % We pull in syslog to adjust the git url. It's just a dependency of lager_syslog
+    {'syslog', "1.0.*", {git, "https://github.com/Vagabond/erlang-syslog", {branch, "master"} } },
+    { lager_syslog, "3.*", { git, "https://github.com/basho/lager_syslog.git", { tag, "3.0.1" } } },
+    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.4.6" } } }
     %% pull in the proper version of meck before jobs 0.3 gets around to pulling in the wrong version
    ]
 }.
@@ -23,7 +25,7 @@
 { eunit_opts, [verbose, {skip_deps, true }] }.
 { eunit_exclude_deps, true }.
 { cover_enabled, true }.
-{ relx, [ { release, { guam, "0.9.11" }, [kolab_guam]},
+{ relx, [ { release, { guam, "0.9.12" }, [kolab_guam]},
                 { dev_mode, false },
                 { include_erts, false },
                 { extended_start_script, true },

guam.dsc Changed

Overview

Request 2943 (accepted)

Request History