updated build system
This commit is contained in:
		| @@ -1,3 +1,9 @@ | ||||
| 2018-04-03 14:27   | ||||
|  | ||||
| 	* [r112] ChangeLog, ax_init_standard_project.m4, | ||||
| 	  build-in-docker.conf, build-in-docker.sh: | ||||
| 	  new feature specify dns; check signature after signing | ||||
|  | ||||
| 2018-03-29 07:44   | ||||
|  | ||||
| 	* [r111] bootstrap.sh, build-in-docker.sh, template.sh: | ||||
|   | ||||
							
								
								
									
										18
									
								
								bootstrap.sh
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								bootstrap.sh
									
									
									
									
									
								
							| @@ -88,7 +88,7 @@ DESCRIPTION | ||||
|   ${DEFAULT_PROJECT_NAME} as the project name for your project in | ||||
|   ${PROJECT_PATH}. In the first run, you should call ${MY_NAME} from a | ||||
|   checked out the bootstrap-build-environment from | ||||
|   https://dev.marc.waeckerlin.org/, and the path from where you call | ||||
|   https://mrw.sh/, and the path from where you call | ||||
|   ${MY_NAME} (which is actually ${PROJECT_PATH}) should be the path to | ||||
|   your newly created project. Please note that your project must be a | ||||
|   checked out subversion or git repository, since this build | ||||
| @@ -98,7 +98,7 @@ DESCRIPTION | ||||
|   subversion on https:/path/to/your/new-project: | ||||
|  | ||||
|     cd ~/svn | ||||
|     svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\ | ||||
|     svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\ | ||||
|            bootstrap-build-environment | ||||
|     svn co https:/path/to/your/new-project/trunk new-project | ||||
|     cd new-project | ||||
| @@ -108,7 +108,7 @@ DESCRIPTION | ||||
|   git on https:/path/to/your/new-project: | ||||
|  | ||||
|     cd ~/svn | ||||
|     svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\ | ||||
|     svn co https://svn.mrw.sh/bootstrap-build-environment/trunk \\ | ||||
|            bootstrap-build-environment | ||||
|     cd ~/git | ||||
|     git clone https:/path/to/your/new-project | ||||
| @@ -1092,10 +1092,10 @@ to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF | ||||
|       "foo": ["sha256", "fcde2b2edxx56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"] | ||||
|     }, | ||||
|     "ldap": { | ||||
|       "url": "ldap://dev.marc.waeckerlin.org", | ||||
|       "adminDn": "cn=tmp,ou=system,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org", | ||||
|       "url": "ldap://your.ldap.host", | ||||
|       "adminDn": "cn=tmp,ou=system,ou=people,dc=your,dc=ldap,dc=host", | ||||
|       "adminPassword": "secret", | ||||
|       "searchBase": "ou=person,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org", | ||||
|       "searchBase": "ou=person,ou=people,dc=your,dc=ldap,dc=host", | ||||
|       "searchFilter": "(uid={{username}})" | ||||
|     } | ||||
|   } | ||||
| @@ -1899,9 +1899,9 @@ to build-in-docker.conf <<EOF | ||||
| ${HEADER}# Use Ubuntu Universe Repository | ||||
| repos+=("ubuntu:::universe") | ||||
|  | ||||
| # Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org | ||||
| repos+=("debian|ubuntu:::https://dev.marc.waeckerlin.org/repository:::https://dev.marc.waeckerlin.org/repository/@DISTRIBUTOR@/marc-waeckerlin.repo") | ||||
| keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey") | ||||
| # Use Marc Wäckerlin's Repository, see https://repository.mrw.sh | ||||
| repos+=("debian|ubuntu:::https://repository.mrw.sh:::https://repository.mrw.sh/@DISTRIBUTOR@/marc-waeckerlin.repo") | ||||
| keys+=("https://repository.mrw.sh/PublicKey") | ||||
|  | ||||
| # centos requires epel-release for some packages, such as Qt WebKit | ||||
| packages+=("centos:::epel-release") | ||||
|   | ||||
| @@ -75,8 +75,8 @@ while test $# -gt 0; do | ||||
|             echo "                     -e ANDROID_HOME=/opt/local/android \\" | ||||
|             echo "                     -d /opt/local/android \\" | ||||
|             echo "                     -r universe \\" | ||||
|             echo "                     -r https://dev.marc.waeckerlin.org/repository \\" | ||||
|             echo "                     -k https://dev.marc.waeckerlin.org/repository/PublicKey \\" | ||||
|             echo "                     -r https://repository.mrw.sh \\" | ||||
|             echo "                     -k https://repository.mrw.sh/PublicKey \\" | ||||
|             echo "                     -p mrw-c++" | ||||
|             echo | ||||
|             exit 0 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user