Skip to content

GitLab

Commit f7e31c74 authored by Robert Smith's avatar Robert Smith
Browse files

Merge remote-tracking branch 'origin/next' into next

parents c90e26f1 376a0f41
Expand all Hide whitespace changes
Inline Side-by-side
docs/visualization/tmp/.gitignore deleted 100644 → 0
View file @ c90e26f1
/MeshEditorTutorial.aux
/MeshEditorTutorial.log
docs/visualization/tmp/OutputVisualizationTutorial.aux deleted 100644 → 0
View file @ c90e26f1
\relax
\providecommand\hyper@newdestlabel[2]{}
\providecommand\HyperFirstAtBeginDocument{\AtBeginDocument}
\HyperFirstAtBeginDocument{\ifx\hyper@anchor\@undefined
\global\let\oldcontentsline\contentsline
\gdef\contentsline#1#2#3#4{\oldcontentsline{#1}{#2}{#3}}
\global\let\oldnewlabel\newlabel
\gdef\newlabel#1#2{\newlabelxx{#1}#2}
\gdef\newlabelxx#1#2#3#4#5#6{\oldnewlabel{#1}{{#2}{#3}}}
\AtEndDocument{\ifx\hyper@anchor\@undefined
\let\contentsline\oldcontentsline
\let\newlabel\oldnewlabel
\fi}
\fi}
\global\let\hyper@last\relax
\gdef\HyperFirstAtBeginDocument#1{#1}
\providecommand\HyField@AuxAddToFields[1]{}
\providecommand\HyField@AuxAddToCoFields[2]{}
\@writefile{toc}{\contentsline {section}{\numberline {1}Visualizing Output}{1}{section.1}}
\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}Installation and Configuration}{1}{subsection.1.1}}
\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.1.1}VisIt Installation}{1}{subsubsection.1.1.1}}
\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.1.2}Configuring the VisIt Connection}{1}{subsubsection.1.1.2}}
\@writefile{toc}{\contentsline {paragraph}{Connecting for the Plot Editor}{1}{section*.1}}
\@writefile{toc}{\contentsline {paragraph}{Connecting for the Visualization Perspective}{2}{section*.2}}
\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.1.3}Using VisIt}{5}{subsubsection.1.1.3}}
\@writefile{toc}{\contentsline {paragraph}{Plot Editor}{5}{section*.3}}
docs/visualization/tmp/OutputVisualizationTutorial.log deleted 100644 → 0
View file @ c90e26f1
This is pdfTeX, Version 3.1415926-2.5-1.40.14 (MiKTeX 2.9) (preloaded format=pdflatex 2016.2.4) 4 FEB 2016 17:13
entering extended mode
**OutputVisualizationTutorial.tex
("C:\Users\r8s\Desktop\ice unstable nightly 6\workspace\ice\docs\visualization\
OutputVisualizationTutorial.tex"
LaTeX2e <2011/06/27>
Babel <v3.8m> and hyphenation patterns for english, afrikaans, ancientgreek, ar
abic, armenian, assamese, basque, bengali, bokmal, bulgarian, catalan, coptic,
croatian, czech, danish, dutch, esperanto, estonian, farsi, finnish, french, ga
lician, german, german-x-2013-05-26, greek, gujarati, hindi, hungarian, iceland
ic, indonesian, interlingua, irish, italian, kannada, kurmanji, latin, latvian,
lithuanian, malayalam, marathi, mongolian, mongolianlmc, monogreek, ngerman, n
german-x-2013-05-26, nynorsk, oriya, panjabi, pinyin, polish, portuguese, roman
ian, russian, sanskrit, serbian, slovak, slovenian, spanish, swedish, swissgerm
an, tamil, telugu, turkish, turkmen, ukenglish, ukrainian, uppersorbian, usengl
ishmax, welsh, loaded.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\base\article.cls"
Document Class: article 2007/10/19 v1.4h Standard LaTeX document class
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\base\size10.clo"
File: size10.clo 2007/10/19 v1.4h Standard LaTeX file (size option)
)
\c@part=\count79
\c@section=\count80
\c@subsection=\count81
\c@subsubsection=\count82
\c@paragraph=\count83
\c@subparagraph=\count84
\c@figure=\count85
\c@table=\count86
\abovecaptionskip=\skip41
\belowcaptionskip=\skip42
\bibindent=\dimen102
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics\graphicx.sty"
Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics\keyval.sty"
Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
\KV@toks@=\toks14
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics\graphics.sty"
Package: graphics 2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\graphics\trig.sty"
Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\00miktex\graphics.cfg"
File: graphics.cfg 2007/01/18 v1.5 graphics configuration of teTeX/TeXLive
)
Package graphics Info: Driver file: pdftex.def on input line 91.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\pdftex-def\pdftex.def"
File: pdftex.def 2011/05/27 v0.06d Graphics/color for pdfTeX
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\infwarerr.sty"
Package: infwarerr 2010/04/08 v1.3 Providing info/warning/error messages (HO)
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\ltxcmds.sty"
Package: ltxcmds 2011/11/09 v1.22 LaTeX kernel commands for general use (HO)
)
\Gread@gobject=\count87
))
\Gin@req@height=\dimen103
\Gin@req@width=\dimen104
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\hyperref\hyperref.sty"
Package: hyperref 2012/11/06 v6.83m Hypertext links for LaTeX
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\hobsub-hyperref.sty"
Package: hobsub-hyperref 2012/04/25 v1.12 Bundle oberdiek, subset hyperref (HO)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\hobsub-generic.sty"
Package: hobsub-generic 2012/04/25 v1.12 Bundle oberdiek, subset generic (HO)
Package: hobsub 2012/04/25 v1.12 Construct package bundles (HO)
Package hobsub Info: Skipping package `infwarerr' (already loaded).
Package hobsub Info: Skipping package `ltxcmds' (already loaded).
Package: ifluatex 2010/03/01 v1.3 Provides the ifluatex switch (HO)
Package ifluatex Info: LuaTeX not detected.
Package: ifvtex 2010/03/01 v1.5 Detect VTeX and its facilities (HO)
Package ifvtex Info: VTeX not detected.
Package: intcalc 2007/09/27 v1.1 Expandable calculations with integers (HO)
Package: ifpdf 2011/01/30 v2.3 Provides the ifpdf switch (HO)
Package ifpdf Info: pdfTeX in PDF mode is detected.
Package: etexcmds 2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)
Package etexcmds Info: Could not find \expanded.
(etexcmds) That can mean that you are not using pdfTeX 1.50 or
(etexcmds) that some package has redefined \expanded.
(etexcmds) In the latter case, load this package earlier.
Package: kvsetkeys 2012/04/25 v1.16 Key value parser (HO)
Package: kvdefinekeys 2011/04/07 v1.3 Define keys (HO)
Package: pdftexcmds 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO
)
Package pdftexcmds Info: LuaTeX not detected.
Package pdftexcmds Info: \pdf@primitive is available.
Package pdftexcmds Info: \pdf@ifprimitive is available.
Package pdftexcmds Info: \pdfdraftmode found.
Package: pdfescape 2011/11/25 v1.13 Implements pdfTeX's escape features (HO)
Package: bigintcalc 2012/04/08 v1.3 Expandable calculations on big integers (HO
)
Package: bitset 2011/01/30 v1.1 Handle bit-vector datatype (HO)
Package: uniquecounter 2011/01/30 v1.2 Provide unlimited unique counter (HO)
)
Package hobsub Info: Skipping package `hobsub' (already loaded).
Package: letltxmacro 2010/09/02 v1.4 Let assignment for LaTeX macros (HO)
Package: hopatch 2011/06/24 v1.1 Wrapper for package hooks (HO)
Package: xcolor-patch 2011/01/30 xcolor patch
Package: atveryend 2011/06/30 v1.8 Hooks at the very end of document (HO)
Package atveryend Info: \enddocument detected (standard20110627).
Package: atbegshi 2011/10/05 v1.16 At begin shipout hook (HO)
Package: refcount 2011/10/16 v3.4 Data extraction from label references (HO)
Package: hycolor 2011/01/30 v1.7 Color options for hyperref/bookmark (HO)
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\ifxetex\ifxetex.sty"
Package: ifxetex 2010/09/12 v0.6 Provides ifxetex conditional
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\oberdiek\auxhook.sty"
Package: auxhook 2011/03/04 v1.3 Hooks for auxiliary files (HO)
)
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\oberdiek\kvoptions.sty"
Package: kvoptions 2011/06/30 v3.11 Key value format for package options (HO)
)
\@linkdim=\dimen105
\Hy@linkcounter=\count88
\Hy@pagecounter=\count89
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\hyperref\pd1enc.def"
File: pd1enc.def 2012/11/06 v6.83m Hyperref: PDFDocEncoding definition (HO)
)
\Hy@SavedSpaceFactor=\count90
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\00miktex\hyperref.cfg"
File: hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive
)
Package hyperref Info: Hyper figures OFF on input line 4443.
Package hyperref Info: Link nesting OFF on input line 4448.
Package hyperref Info: Hyper index ON on input line 4451.
Package hyperref Info: Plain pages OFF on input line 4458.
Package hyperref Info: Backreferencing OFF on input line 4463.
Package hyperref Info: Implicit mode ON; LaTeX internals redefined.
Package hyperref Info: Bookmarks ON on input line 4688.
\c@Hy@tempcnt=\count91
(C:\Users\r8s\AppData\Roaming\MiKTeX\2.9\tex\latex\url\url.sty
\Urlmuskip=\muskip10
Package: url 2013/09/16 ver 3.4 Verb mode for urls, etc.
)
LaTeX Info: Redefining \url on input line 5041.
\XeTeXLinkMargin=\dimen106
\Fld@menulength=\count92
\Field@Width=\dimen107
\Fld@charsize=\dimen108
Package hyperref Info: Hyper figures OFF on input line 6295.
Package hyperref Info: Link nesting OFF on input line 6300.
Package hyperref Info: Hyper index ON on input line 6303.
Package hyperref Info: backreferencing OFF on input line 6310.
Package hyperref Info: Link coloring OFF on input line 6315.
Package hyperref Info: Link coloring with OCG OFF on input line 6320.
Package hyperref Info: PDF/A mode OFF on input line 6325.
LaTeX Info: Redefining \ref on input line 6365.
LaTeX Info: Redefining \pageref on input line 6369.
\Hy@abspage=\count93
\c@Item=\count94
\c@Hfootnote=\count95
)
Package hyperref Message: Driver (autodetected): hpdftex.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\hyperref\hpdftex.def"
File: hpdftex.def 2012/11/06 v6.83m Hyperref driver for pdfTeX
\Fld@listcount=\count96
\c@bookmark@seq@number=\count97
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\oberdiek\rerunfilecheck.sty"
Package: rerunfilecheck 2011/04/15 v1.7 Rerun checks for auxiliary files (HO)
Package uniquecounter Info: New unique counter `rerunfilecheck' on input line 2
82.
)
\Hy@SectionHShift=\skip43
)
("C:\Users\r8s\Desktop\ice unstable nightly 6\workspace\ice\docs\visualization\
OutputVisualizationTutorial.aux")
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 8.
LaTeX Font Info: ... okay on input line 8.
LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line 8.
LaTeX Font Info: ... okay on input line 8.
LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line 8.
LaTeX Font Info: ... okay on input line 8.
LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line 8.
LaTeX Font Info: ... okay on input line 8.
LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 8.
LaTeX Font Info: ... okay on input line 8.
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 8.
LaTeX Font Info: ... okay on input line 8.
LaTeX Font Info: Checking defaults for PD1/pdf/m/n on input line 8.
LaTeX Font Info: ... okay on input line 8.
(C:\Users\r8s\AppData\Roaming\MiKTeX\2.9\tex\context\base\supp-pdf.mkii
[Loading MPS to PDF converter (version 2006.09.02).]
\scratchcounter=\count98
\scratchdimen=\dimen109
\scratchbox=\box26
\nofMPsegments=\count99
\nofMParguments=\count100
\everyMPshowfont=\toks15
\MPscratchCnt=\count101
\MPscratchDim=\dimen110
\MPnumerator=\count102
\makeMPintoPDFobject=\count103
\everyMPtoPDFconversion=\toks16
)
\AtBeginShipoutBox=\box27
Package hyperref Info: Link coloring OFF on input line 8.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\hyperref\nameref.sty"
Package: nameref 2012/10/27 v2.43 Cross-referencing by name of section
("C:\Program Files (x86)\MiKTeX 2.9\tex\generic\oberdiek\gettitlestring.sty"
Package: gettitlestring 2010/12/03 v1.4 Cleanup title references (HO)
)
\c@section@level=\count104
)
LaTeX Info: Redefining \ref on input line 8.
LaTeX Info: Redefining \pageref on input line 8.
LaTeX Info: Redefining \nameref on input line 8.
("C:\Users\r8s\Desktop\ice unstable nightly 6\workspace\ice\docs\visualization\
OutputVisualizationTutorial.out")
("C:\Users\r8s\Desktop\ice unstable nightly 6\workspace\ice\docs\visualization\
OutputVisualizationTutorial.out")
\@outlinefile=\write3
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <7> on input line 51.
LaTeX Font Info: External font `cmex10' loaded for size
(Font) <5> on input line 51.
<images/VisItPreferencePage_ICE.png, id=20, 477.28313pt x 413.29407pt>
File: images/VisItPreferencePage_ICE.png Graphic file (type png)
<use images/VisItPreferencePage_ICE.png>
Package pdftex.def Info: images/VisItPreferencePage_ICE.png used on input line
55.
(pdftex.def) Requested size: 341.43306pt x 295.65436pt.
[1
{C:/Users/r8s/AppData/Local/MiKTeX/2.9/pdftex/config/pdftex.map}]
LaTeX Font Info: Try loading font information for OMS+cmr on input line 70.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\base\omscmr.fd"
File: omscmr.fd 1999/05/25 v2.5h Standard LaTeX font definitions
)
LaTeX Font Info: Font shape `OMS/cmr/m/n' in size <10> not available
(Font) Font shape `OMS/cmsy/m/n' tried instead on input line 70.
[2 <C:/Users/r8s/Desktop/ice unstable nightly 6/workspace/ice/docs/visualizati
on/images/VisItPreferencePage_ICE.png>]
<images/ICE_OpenPerspective.png, id=36, 232.87pt x 153.57375pt>
File: images/ICE_OpenPerspective.png Graphic file (type png)
<use images/ICE_OpenPerspective.png>
Package pdftex.def Info: images/ICE_OpenPerspective.png used on input line 84.
(pdftex.def) Requested size: 232.86942pt x 153.57336pt.
<images/ICE_VisItLaunchButton.png, id=38, 306.14375pt x 146.5475pt>
File: images/ICE_VisItLaunchButton.png Graphic file (type png)
<use images/ICE_VisItLaunchButton.png>
Package pdftex.def Info: images/ICE_VisItLaunchButton.png used on input line 90
.
(pdftex.def) Requested size: 306.14299pt x 146.54712pt.
<images/ICE_VisItLaunchOptions.png, id=39, 604.2575pt x 587.19376pt>
File: images/ICE_VisItLaunchOptions.png Graphic file (type png)
<use images/ICE_VisItLaunchOptions.png>
Package pdftex.def Info: images/ICE_VisItLaunchOptions.png used on input line 9
6.
(pdftex.def) Requested size: 341.43306pt x 331.79196pt.
[3 <C:/Users/r8s/Desktop/ice unstable nightly 6/workspace/ice/docs/visualizati
on/images/ICE_OpenPerspective.png> <C:/Users/r8s/Desktop/ice unstable nightly 6
/workspace/ice/docs/visualization/images/ICE_VisItLaunchButton.png>] [4 <C:/Use
rs/r8s/Desktop/ice unstable nightly 6/workspace/ice/docs/visualization/images/I
CE_VisItLaunchOptions.png (PNG copy)>]
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 155.
[5]
Package atveryend Info: Empty hook `AfterLastShipout' on input line 155.
("C:\Users\r8s\Desktop\ice unstable nightly 6\workspace\ice\docs\visualization\
OutputVisualizationTutorial.aux")
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 155.
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 155.
Package rerunfilecheck Warning: File `OutputVisualizationTutorial.out' has chan
ged.
(rerunfilecheck) Rerun to get outlines right
(rerunfilecheck) or use package `bookmark'.
Package rerunfilecheck Info: Checksums for `OutputVisualizationTutorial.out':
(rerunfilecheck) Before: 322E5E11B4191EB1827AE40C1C5145BD;304
(rerunfilecheck) After: 4B0079D61B538992024A77C991A54016;375.
Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 155.
)
Here is how much of TeX's memory you used:
4979 strings out of 493921
75387 string characters out of 3144883
151756 words of memory out of 3000000
8254 multiletter control sequences out of 15000+200000
5158 words of font info for 19 fonts, out of 3000000 for 9000
841 hyphenation exceptions out of 8191
29i,4n,28p,260b,381s stack positions out of 5000i,500n,10000p,200000b,50000s
<C:/Program Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmbx10.pfb>
<C:/Program Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmbx12.pfb><C
:/Program Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmmi10.pfb><C:/
Program Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmr10.pfb><C:/Pro
gram Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmsy10.pfb>
Output written on OutputVisualizationTutorial.pdf (5 pages, 219807 bytes).
PDF statistics:
79 PDF objects out of 1000 (max. 8388607)
14 named destinations out of 1000 (max. 500000)
53 words of extra memory for PDF output out of 10000 (max. 10000000)
docs/visualization/tmp/OutputVisualizationTutorial.out deleted 100644 → 0
View file @ c90e26f1
\BOOKMARK [1][-]{section.1}{Visualizing Output}{}% 1
\BOOKMARK [2][-]{subsection.1.1}{Installation and Configuration}{section.1}% 2
\BOOKMARK [3][-]{subsubsection.1.1.1}{VisIt Installation}{subsection.1.1}% 3
\BOOKMARK [3][-]{subsubsection.1.1.2}{Configuring the VisIt Connection}{subsection.1.1}% 4
\BOOKMARK [3][-]{subsubsection.1.1.3}{Using VisIt}{subsection.1.1}% 5
org.eclipse.ice.aggregator/Build ICE.launch 0 → 100644
View file @ f7e31c74
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean verify"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES"/>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
<intAttribute key="M2_THREADS" value="1"/>
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 8 [1.8.0_71]"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.ice.aggregator}"/>
</launchConfiguration>
org.eclipse.ice.developer/META-INF/MANIFEST.MF
View file @ f7e31c74
......@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",
org.eclipse.egit.ui;bundle-version="4.0.0",
org.eclipse.core.commands,
org.eclipse.debug.core;bundle-version="3.10.0",
org.eclipse.equinox.security;bundle-version="1.2.100"
org.eclipse.equinox.security;bundle-version="1.2.100",
org.eclipse.m2e.core;bundle-version="1.6.0"
Import-Package: org.apache.commons.io;version="2.2.0",
org.eclipse.egit.github.core;version="4.0.0",
org.eclipse.egit.github.core.service;version="4.0.0",
......
org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/BuildICEHandler.java
View file @ f7e31c74
......@@ -11,6 +11,11 @@
*******************************************************************************/
package org.eclipse.ice.developer.actions;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
......@@ -26,6 +31,8 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.internal.lifecyclemapping.model.LifecycleMappingMetadataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -56,23 +63,20 @@ public class BuildICEHandler extends AbstractHandler {
ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
if (manager != null) {
IProject iceProject = ResourcesPlugin.getWorkspace().getRoot().getProject("ice");
IProject aggregatorProject = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.ice.aggregator");
if (iceProject != null) {
if (aggregatorProject != null) {
// Get the Launch Configurations files
IFile mvnInitialInstall = iceProject.getFile("ICE Build - Initial Install.launch");
IFile mvnCleanInstall = iceProject.getFile("ICE Build - Clean and Install.launch");
IFile mvnInstall = aggregatorProject.getFile("Build ICE.launch");
// Get the Launch Configuration from those files
ILaunchConfiguration initialConfig = manager.getLaunchConfiguration(mvnInitialInstall);
ILaunchConfiguration installConfig = manager.getLaunchConfiguration(mvnCleanInstall);
ILaunchConfiguration installConfig = manager.getLaunchConfiguration(mvnInstall);
// Create and launch the Job.
Job job = new WorkspaceJob("Building ICE") {
@Override
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
initialConfig.launch(ILaunchManager.RUN_MODE, monitor);
installConfig.launch(ILaunchManager.RUN_MODE, monitor);
return Status.OK_STATUS;
}
......
org.eclipse.ice.developer/src/org/eclipse/ice/developer/actions/ICECloneHandler.java
View file @ f7e31c74
......@@ -12,21 +12,18 @@
package org.eclipse.ice.developer.actions;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.eclipse.core.commands.Command;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IParameter;
import org.eclipse.core.commands.IParameterValues;
import org.eclipse.core.commands.ParameterValuesException;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
......@@ -40,10 +37,8 @@ import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.internal.clone.ProjectRecord;
import org.eclipse.egit.ui.internal.clone.ProjectUtils;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.handlers.IHandlerService;
/**
* The ICECloneHandler clones the ICE repository and adds PostCloneTasks that
......@@ -62,34 +57,23 @@ public class ICECloneHandler extends GitCloneHandler {
*/
protected void addPostCloneTasks() {
// Add a post clone task that clones the visit java client
cloneOperation.addPostCloneTask(new PostCloneTask() {
@Override
public void execute(Repository repository, IProgressMonitor monitor) throws CoreException {
cloneICEDependency("https://github.com/visit-vis/visit_java_client");
}
});
// Add a post clone task that clones the dependencies bundle
cloneOperation.addPostCloneTask(new PostCloneTask() {
@Override
public void execute(Repository repository, IProgressMonitor monitor) throws CoreException {
cloneICEDependency("https://github.com/jayjaybillings/ICEDeps");
}
});
// Add a post clone task that clones the ICETests bundle
/*cloneOperation.addPostCloneTask(new PostCloneTask() {
@Override
public void execute(Repository repository, IProgressMonitor monitor) throws CoreException {
cloneICEDependency("https://github.com/jayjaybillings/ICETests");
}
});*/
// Import all ICE projects
cloneOperation.addPostCloneTask(new PostCloneTask() {
@Override
public void execute(Repository repository, IProgressMonitor monitor) throws CoreException {
// This is a fix for the errors that occur with the new ICE Build for
// certain maven goals.
String file = MavenPlugin.getMavenConfiguration().getWorkspaceLifecycleMappingMetadataFile();
try {
Path path = Paths.get(file);
if (Files.exists(path)) {
Files.write(Paths.get(file), lifecycleXML.getBytes());
} else {
Files.write(Paths.get(file), lifecycleXML.getBytes(), StandardOpenOption.CREATE_NEW);
}
} catch (IOException e) {
e.printStackTrace();
}
importProjects(repository, new IWorkingSet[0]);
}
......@@ -130,121 +114,55 @@ public class ICECloneHandler extends GitCloneHandler {
};
importJob.schedule();
}
/**
* This private method is used by ICECloneHandler to execute further repo
* clones for ICE dependencies after the main ICE clone has finished.
*
* @param repo
* Reference to the XML file contents we need for life cycle management M2e file.
*/
@SuppressWarnings("unchecked")
private void cloneICEDependency(String repo) {
// Get the services we need
ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
IHandlerService handlerService = PlatformUI.getWorkbench().getService(IHandlerService.class);
// Clear the parameters map and add the repoURLID key-value
// required by the GitCloneHandler
handlerParameters.clear();
handlerParameters.put("repoURLID", repo);
// Create a Parameters list that matches the map
ArrayList<IParameter> parameters = new ArrayList<IParameter>();
// We need ICETests to be cloned to the home directory
if (repo.contains("ICETests")) {
handlerParameters.put("cloneDirectory", System.getProperty("user.home"));
parameters.add(new IParameter() {
@Override
public String getId() {
return "cloneDirectory";
}
@Override
public String getName() {
return repo;
}
@Override
public IParameterValues getValues() throws ParameterValuesException {
return new IParameterValues() {
@Override
public Map getParameterValues() {
HashMap<String, String> map = new HashMap<String, String>();
map.put(getId(), getName());
return map;
};
};
}
@Override
public boolean isOptional() {
return false;
}
});
}
// Add the Repo IParameter
parameters.add(new IParameter() {
@Override
public String getId() {
return "repoURLID";
}
@Override
public String getName() {
return repo;
}
@Override
public IParameterValues getValues() throws ParameterValuesException {
return new IParameterValues() {
@Override
public Map getParameterValues() {