Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move ddrgen step after building VM #110

Merged
merged 1 commit into from
Aug 15, 2018

Conversation

mikezhang1234567890
Copy link
Contributor

Move the run ddrgen step outside of the building VM step in order to
resolve DDR dependencies better.

This PR moves the run ddrgen step to after the VM is built, and needs to be delivered together with eclipse-openj9/openj9#2588.

Signed-off-by: mikezhang [email protected]

@@ -70,6 +70,9 @@ OPENJ9_VM_FILES := \
#

ifeq (true,$(OPENJ9_ENABLE_DDR))
$(OUTPUT_ROOT)/vm/j9ddr.dat :
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should list the prerequisites so j9ddr.dat will be updated when necessary.

@@ -70,6 +70,13 @@ OPENJ9_VM_FILES := \
#

ifeq (true,$(OPENJ9_ENABLE_DDR))
$(OUTPUT_ROOT)/vm/j9ddr.dat : run-ddrgen
run-ddrgen :
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be a rule

.PHONY : run-ddrgen

@mikezhang1234567890 mikezhang1234567890 force-pushed the ddr-compile branch 2 times, most recently from 736751d to 6df4861 Compare August 14, 2018 20:52
@mikezhang1234567890
Copy link
Contributor Author

@keithc-ca can you review again please?

.PHONY : run-ddrgen
$(OUTPUT_ROOT)/vm/j9ddr.dat : run-ddrgen
run-ddrgen :
export $(EXPORT_MSVS_ENV_VARS) \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may not work well when EXPORT_MSVS_ENV_VARS is empty. Without arguments, export (on the versions of bash I tested) just dumps the existing environment variables. We could move OPENJDK_VERSION_NUMBER_FOUR_POSITIONS and VERSION_MAJOR into the export command to avoid that.

Move the run ddrgen step outside of the building VM step in order to
resolve DDR dependencies better.

Signed-off-by: mikezhang <[email protected]>
@keithc-ca
Copy link
Member

Jenkins compile plinux,win

@keithc-ca keithc-ca merged commit 2b004fd into ibmruntimes:openj9 Aug 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants