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

Merge branch 'next' into UnifiedVizRefactor_NoReactor

Conflicts:
	org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
	org.eclipse.ice.client.widgets.reactoreditor.lwr/META-INF/MANIFEST.MF
	org.eclipse.ice.client.widgets.reactoreditor.lwr/src/org/eclipse/ice/client/widgets/reactoreditor/lwr/PlantAnalysisView.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEShapeTester.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java
	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/GeometryComponent.java
	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/geometry/ICEGeometry.java...
parents 132780b2 5b3deaa7
......@@ -14,9 +14,6 @@
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="LD_LIBRARY_PATH" value="/home/bkj/Programs/hdf-java-2.10/HDF-JAVA-2.10.0-Linux/usr/lib/"/>
</mapAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/ice}"/>
</launchConfiguration>
......@@ -10,7 +10,7 @@
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
<intAttribute key="M2_THREADS" value="0"/>
<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"/>
......
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
-include ../makefile.init
RM := rm -rf
# All of the sources participating in the build are defined here
-include sources.mk
-include subdir.mk
-include objects.mk
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(strip $(CC_DEPS)),)
-include $(CC_DEPS)
endif
ifneq ($(strip $(C++_DEPS)),)
-include $(C++_DEPS)
endif
ifneq ($(strip $(C_UPPER_DEPS)),)
-include $(C_UPPER_DEPS)
endif
ifneq ($(strip $(CXX_DEPS)),)
-include $(CXX_DEPS)
endif
ifneq ($(strip $(CPP_DEPS)),)
-include $(CPP_DEPS)
endif
ifneq ($(strip $(C_DEPS)),)
-include $(C_DEPS)
endif
endif
-include ../makefile.defs
# Add inputs and outputs from these tool invocations to the build variables
# All Target
all: org.eclipse.ice.reactor.sfr.native.test
# Tool invocations
org.eclipse.ice.reactor.sfr.native.test: $(OBJS) $(USER_OBJS)
@echo 'Building target: $@'
@echo 'Invoking: GCC C++ Linker'
g++ -o "org.eclipse.ice.reactor.sfr.native.test" $(OBJS) $(USER_OBJS) $(LIBS)
@echo 'Finished building target: $@'
@echo ' '
# Other Targets
clean:
-$(RM) $(CC_DEPS)$(C++_DEPS)$(EXECUTABLES)$(C_UPPER_DEPS)$(CXX_DEPS)$(OBJS)$(CPP_DEPS)$(C_DEPS) org.eclipse.ice.reactor.sfr.native.test
-@echo ' '
.PHONY: all clean dependents
.SECONDARY:
-include ../makefile.targets
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
USER_OBJS :=
LIBS :=
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
C_UPPER_SRCS :=
CXX_SRCS :=
C++_SRCS :=
OBJ_SRCS :=
CC_SRCS :=
ASM_SRCS :=
CPP_SRCS :=
C_SRCS :=
O_SRCS :=
S_UPPER_SRCS :=
CC_DEPS :=
C++_DEPS :=
EXECUTABLES :=
C_UPPER_DEPS :=
CXX_DEPS :=
OBJS :=
CPP_DEPS :=
C_DEPS :=
# Every subdirectory with source files must be described here
SUBDIRS := \
. \
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
# Add inputs and outputs from these tool invocations to the build variables
CPP_SRCS += \
../FeatureSetTester.cpp \
../GridDataManagerTester.cpp \
../GridManagerTester.cpp \
../MaterialBlockTester.cpp \
../MaterialTester.cpp \
../PinAssemblyTester.cpp \
../ReflectorAssemblyTester.cpp \
../RingTester.cpp \
../SFRAssemblyTester.cpp \
../SFRComponentTester.cpp \
../SFRCompositeTester.cpp \
../SFRDataTester.cpp \
../SFRPinTester.cpp \
../SFRRodTester.cpp \
../SFReactorIOHandlerTester.cpp \
../SFReactorTester.cpp
OBJS += \
./FeatureSetTester.o \
./GridDataManagerTester.o \
./GridManagerTester.o \
./MaterialBlockTester.o \
./MaterialTester.o \
./PinAssemblyTester.o \
./ReflectorAssemblyTester.o \
./RingTester.o \
./SFRAssemblyTester.o \
./SFRComponentTester.o \
./SFRCompositeTester.o \
./SFRDataTester.o \
./SFRPinTester.o \
./SFRRodTester.o \
./SFReactorIOHandlerTester.o \
./SFReactorTester.o
CPP_DEPS += \
./FeatureSetTester.d \
./GridDataManagerTester.d \
./GridManagerTester.d \
./MaterialBlockTester.d \
./MaterialTester.d \
./PinAssemblyTester.d \
./ReflectorAssemblyTester.d \
./RingTester.d \
./SFRAssemblyTester.d \
./SFRComponentTester.d \
./SFRCompositeTester.d \
./SFRDataTester.d \
./SFRPinTester.d \
./SFRRodTester.d \
./SFReactorIOHandlerTester.d \
./SFReactorTester.d
# Each subdirectory must supply rules for building sources it contributes
%.o: ../%.cpp
@echo 'Building file: $<'
@echo 'Invoking: GCC C++ Compiler'
g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<'
@echo ' '
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.analysistool</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
#Tue Jul 17 10:52:01 EDT 2012
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
#Tue Jul 17 10:52:01 EDT 2012
eclipse.preferences.version=1
resolve.requirebundle=false
pluginProject.extensions=false
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
schema/,\
.,\
plugin.xml
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension-point id="IAnalysisTool" name="Analysis Tool" schema="schema/IAnalysisTool.exsd"/>
</plugin>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment