merging
authorVolker Birk <vb@pep-project.org>
Sat, 21 May 2016 16:37:24 +0200
changeset 673999e63e9b094
parent 672 f7bcbc1db9bf
parent 671 951f465c41c1
child 674 a8afa1168b12
merging
     1.1 --- a/.hgignore	Fri May 20 16:54:50 2016 +0200
     1.2 +++ b/.hgignore	Sat May 21 16:37:24 2016 +0200
     1.3 @@ -1,3 +1,8 @@
     1.4 +syntax: regexp
     1.5 +^asn\.1/.*\.(c|h)$
     1.6 +^asn\.1/Makefile\.am\.sample$
     1.7 +^asn\.1/libasn1\.a$
     1.8 +
     1.9  syntax: glob
    1.10  *.orig
    1.11  *.d
     2.1 --- a/Makefile.conf	Fri May 20 16:54:50 2016 +0200
     2.2 +++ b/Makefile.conf	Sat May 21 16:37:24 2016 +0200
     2.3 @@ -10,6 +10,10 @@
     2.4  YML2PROC=$(HOME)/yml2/yml2proc
     2.5  YML_HOME=$(HOME)
     2.6  ASN1C=asn1c
     2.7 +
     2.8 +# TODO: For brew this is /usr/local/share/asn1c
     2.9 +# On BSDs, it might be that as well. How to check?
    2.10 +# For now, it just works, even when it doesn't exist.
    2.11  ASN1C_INCLUDE=/opt/local/share/asn1c
    2.12  
    2.13  # C makros (not environment variables) to overwrite:
     3.1 --- a/asn.1/Makefile	Fri May 20 16:54:50 2016 +0200
     3.2 +++ b/asn.1/Makefile	Sat May 21 16:37:24 2016 +0200
     3.3 @@ -10,7 +10,7 @@
     3.4  	rm -f converter-sample.c
     3.5  
     3.6  %.o: %.c %.h
     3.7 -	$(CC) $(CFLAGS) $(OPTIMIZE) -I$(ASN1C_INCLUDE) -c $< -o $@
     3.8 +	$(CC) $(CFLAGS) $(OPTIMIZE) -I. -I$(ASN1C_INCLUDE) -c $< -o $@
     3.9  
    3.10  DeviceGroup-Protocol.c: devicegroup.asn1
    3.11  	$(ASN1C) -gen-PER -fincludes-quoted -fcompound-names -pdu=PEP.Message pEp.asn1 $<
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/build-mac/README.md	Sat May 21 16:37:24 2016 +0200
     4.3 @@ -0,0 +1,15 @@
     4.4 +# Building for iOS
     4.5 +
     4.6 +This is done with Xcode. Simply add `pEpEngine.xcodeproj` to
     4.7 +your project and add a dependency to the target `pEpEngine`
     4.8 +(in `Target Dependencies` in your `Build Phases`.
     4.9 +
    4.10 +Usually you just integrate `pEpiOSAdapter.xcodeproj`.
    4.11 +
    4.12 +## Dependencies
    4.13 +
    4.14 +You need a working [asn1c](https://lionet.info/asn1c/blog/).
    4.15 +
    4.16 +```
    4.17 +brew install asn1c
    4.18 +```
     5.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri May 20 16:54:50 2016 +0200
     5.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Sat May 21 16:37:24 2016 +0200
     5.3 @@ -677,7 +677,7 @@
     5.4  			);
     5.5  			runOnlyForDeploymentPostprocessing = 0;
     5.6  			shellPath = /bin/sh;
     5.7 -			shellScript = "mkdir -p \"$BUILT_PRODUCTS_DIR/include\"\n\ncp \"$SRCROOT/../src/\"{\\\npEpEngine.h,\\\ncryptotech.h,\\\nkeymanagement.h,\\\nmessage_api.h,\\\ndynamic_api.h,\\\nstringlist.h,\\\ntimestamp.h,\\\nidentity_list.h,\\\nbloblist.h,\\\nstringpair.h,\\\nmessage.h,\\\nmime.h} \"$BUILT_PRODUCTS_DIR/include\"\n";
     5.8 +			shellScript = "mkdir -p \"$BUILT_PRODUCTS_DIR/include\"\n\ncp \"$SRCROOT/../src/\"{\\\npEpEngine.h,\\\ncryptotech.h,\\\nkeymanagement.h,\\\nmessage_api.h,\\\ndynamic_api.h,\\\nstringlist.h,\\\ntimestamp.h,\\\nidentity_list.h,\\\nbloblist.h,\\\nstringpair.h,\\\nmessage.h,\\\nmime.h} \"$BUILT_PRODUCTS_DIR/include\"\n\npushd ../asn.1\nmake generate\nmake\npopd";
     5.9  		};
    5.10  /* End PBXShellScriptBuildPhase section */
    5.11  
    5.12 @@ -826,6 +826,7 @@
    5.13  					"$(SRCROOT)/../../netpgp-et/include/",
    5.14  					"$(SRCROOT)/../../netpgp-et/src/",
    5.15  					"$(SRCROOT)/../../netpgp-et/netpgp-xcode/openssl/include/",
    5.16 +					"$(SRCROOT)/../asn.1/",
    5.17  				);
    5.18  				MTL_ENABLE_DEBUG_INFO = YES;
    5.19  				ONLY_ACTIVE_ARCH = YES;
    5.20 @@ -869,6 +870,7 @@
    5.21  					"$(SRCROOT)/../../netpgp-et/include/",
    5.22  					"$(SRCROOT)/../../netpgp-et/src/",
    5.23  					"$(SRCROOT)/../../netpgp-et/netpgp-xcode/openssl/include/",
    5.24 +					"$(SRCROOT)/../asn.1/",
    5.25  				);
    5.26  				MTL_ENABLE_DEBUG_INFO = NO;
    5.27  				ONLY_ACTIVE_ARCH = NO;