Skip to content

Commit ccd25ee

Browse files
authored
Merge pull request #58 from microclimate-dev2ops/buildUpdates
Variety of build updates
2 parents a2470af + 45a0548 commit ccd25ee

File tree

13 files changed

+77
-348
lines changed

13 files changed

+77
-348
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.DS_STORE
2+
**/runtime-New_configuration/

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,15 @@ For more information see the [documentation](https://microclimate-dev2ops.github
4545

4646
We welcome [issues](https://github.com/microclimate-dev2ops/microclimate-eclipse-tools/issues) and contributions. For more information, see [CONTRIBUTING.md](https://github.com/microclimate-dev2ops/microclimate-eclipse-tools/tree/master/CONTRIBUTING.md).
4747

48+
### Enabling Debug Logs
49+
50+
1. Create a file called `.options` in your Eclipse install directory (the same directory with the `eclipse` executable) with the following content:
51+
52+
`com.ibm.microclimate.core/debug/info=true`
53+
54+
2. Launch eclipse with the `-debug` flag.
55+
3. The logs are written to the Eclipse workspace directory, to `.metadata/.log`.
56+
4857
## Building
4958

5059
1. Clone the repository to your system.
@@ -80,4 +89,3 @@ We welcome [issues](https://github.com/microclimate-dev2ops/microclimate-eclipse
8089
| [json-20090211.jar](https://mvnrepository.com/artifact/org.json/json/20090211) | [The JSON License](http://www.json.org/license.html) |
8190
| [okhttp-3.8.1.jar](https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp/3.8.1) | [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) |
8291
| [okio-1.13.0.jar](https://mvnrepository.com/artifact/com.squareup.okio/okio/1.13.0) | [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) |
83-

dev/.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.metadata/
2+
.gradle/
3+
target_platform/
4+
tools.image/
5+
**/tools.pii.package
6+
com.ibm.microclimate*/**/build/
7+
ant_build/buildLabel.properties
8+
ant_build/target_platform.tar.gz

dev/.project

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>dev</name>
4+
<comment>Project dev created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
</projectDescription>

dev/ant_build/build-mdt.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2018 IBM Corporation and others.
2+
Copyright (c) 2018, 2019 IBM Corporation and others.
33
All rights reserved. This program and the accompanying materials
44
are made available under the terms of the Eclipse Public License v2.0
55
which accompanies this distribution, and is available at
@@ -23,18 +23,18 @@
2323
<import file="${mdt_build.basedir}/resources/build_imports/liberty-all.xml" />
2424
<import file="${mdt_build.basedir}/mdt_imports.xml"/>
2525
<import file="${mdt_build.basedir}/mdt_test_imports.xml"/>
26-
<import file="${mdt_build.basedir}/prereqs/prereqs.xml" />
2726

2827
<target name="getMDTBuildLabel" depends="createBuildLabelFile">
2928
<loadproperties srcFile="${mdt_build.basedir}/buildLabel.properties"/>
3029
<echo>Build label is "${buildLabel}"</echo>
3130
</target>
3231

33-
<target name="checkBuildLabelFile" >
32+
<!--target name="checkBuildLabelFile" >
3433
<available file="${mdt_build.basedir}/buildLabel.properties" property="buildLabel.present"/>
35-
</target>
34+
</target-->
3635

37-
<target name="createBuildLabelFile" depends="checkBuildLabelFile" unless="buildLabel.present">
36+
<!--target name="createBuildLabelFile" depends="checkBuildLabelFile" unless="buildLabel.present"-->
37+
<target name="createBuildLabelFile">
3838
<tstamp>
3939
<format property="buildLabel" pattern="yyyyMMdd_HHmm" timezone="UTC"/>
4040
</tstamp>
@@ -44,7 +44,7 @@
4444
</propertyfile>
4545
</target>
4646

47-
<target name="compile" depends="getMDTBuildLabel, preparePrereqsIvy" unless="${env.skip_compile_mdt}">
47+
<target name="compile" depends="getMDTBuildLabel" unless="${env.skip_compile_mdt}">
4848
<echo message="Build label is ${buildLabel}"/>
4949
<antcall target="liberty-all.compile" />
5050
<echo message="mdt_imports.generateMDTSuppliersUpdateSite call"/>

dev/ant_build/prereqs/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

dev/ant_build/prereqs/ivysettings-remote.xml

Lines changed: 0 additions & 38 deletions
This file was deleted.

dev/ant_build/prereqs/manifest-reader.xml

Lines changed: 0 additions & 69 deletions
This file was deleted.

dev/ant_build/prereqs/prereqs.properties

Lines changed: 0 additions & 17 deletions
This file was deleted.

dev/ant_build/prereqs/prereqs.xml

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)