Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes EUCA-3902. Added make indent.

  • Loading branch information...
commit 6105183574ee997ccae3048cc3424c5bac714288 1 parent 320b675
gelinasc gelinasc authored
Showing with 248 additions and 175 deletions.
  1. +13 −0 Makefile
  2. +3 −1 clc/Makefile
  3. +4 −0 clc/build.xml
  4. +7 −5 clc/modules/authentication/build.xml
  5. +3 −0  clc/modules/bootstrap/build.xml
  6. +4 −0 clc/modules/bootstrap/src/main/native/Makefile
  7. +8 −6 clc/modules/cloud/build.xml
  8. +2 −0  clc/modules/cluster-manager/build.xml
  9. +7 −5 clc/modules/component/build.xml
  10. +7 −5 clc/modules/configuration/build.xml
  11. +7 −5 clc/modules/core/build.xml
  12. +3 −1 clc/modules/dns/build.xml
  13. +7 −5 clc/modules/euare-common/build.xml
  14. +7 −5 clc/modules/euare/build.xml
  15. +4 −0 clc/modules/module-inc.xml
  16. +5 −3 clc/modules/msgs/build.xml
  17. +10 −6 clc/modules/notifications/build.xml
  18. +8 −6 clc/modules/postgresql/build.xml
  19. +12 −10 clc/modules/reporting/build.xml
  20. +13 −12 clc/modules/storage-common/build.xml
  21. +19 −17 clc/modules/storage-controller/build.xml
  22. +3 −0  clc/modules/storage-controller/native/Makefile
  23. +7 −5 clc/modules/tokens/build.xml
  24. +3 −1 clc/modules/troubleshooting/build.xml
  25. +26 −24 clc/modules/walrus/build.xml
  26. +3 −1 clc/modules/wsstack/build.xml
  27. +50 −49 clc/modules/www/build.xml
  28. +3 −3 node/Makefile
13 Makefile
View
@@ -14,6 +14,15 @@ SUBDIRS = tools \
cluster \
clc
+INDENTDIRS = cluster \
+ util \
+ net \
+ storage \
+ gatherlog \
+ node \
+ cluster \
+ clc
+
.PHONY: all clean distclean build
all: build
@@ -63,6 +72,10 @@ uninstall:
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit $$? ; done
+indent:
+ @for subdir in $(INDENTDIRS); do \
+ (cd $$subdir && $(MAKE) $@) || exit $$? ; done
+
clean:
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit $$? ; done
4 clc/Makefile
View
@@ -120,7 +120,9 @@ build-test: deps extras
@ANT_OPTS="-Xmx1g -XX:MaxPermSize=512m" $(ANT) jar
@make -C eucadmin
-
+indent:
+ $(ANT) indent
+
clean: deps
$(ANT) clean
make -C eucadmin clean
4 clc/build.xml
View
@@ -125,6 +125,10 @@
</target>
<!--================================== clean targets ==================================-->
+ <target name="indent">
+ <call-module-target target="indent"/>
+ </target>
+ <!--================================== clean targets ==================================-->
<target name="clean">
<call-module-target target="clean"/>
<delete file="${project.basedir}/modules/msgs/src/main/resources/msgs-binding.xml"/>
12 clc/modules/authentication/build.xml
View
@@ -61,9 +61,11 @@
-->
<project name="eucalyptus-auth" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
- <import file="../module-inc.xml"/>
+ <property name="builder.suffix" value="groovy" />
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+ <import file="../module-inc.xml"/>
+ <target name="indent-module">
+ </target>
</project>
3  clc/modules/bootstrap/build.xml
View
@@ -65,6 +65,9 @@
<import file="../module-inc.xml"/>
<!--================================== BUILD TARGETS ==================================-->
+ <target name="indent-module">
+ <native-make dir="src/main/native" target="indent" />
+ </target>
<target name="build-module">
<mkdir dir="build"/>
<native-make dir="src/main/native" target="all" />
4 clc/modules/bootstrap/src/main/native/Makefile
View
@@ -88,6 +88,10 @@ install: eucalyptus-cloud
$(INSTALL) -d $(DESTDIR)$(sbindir)
$(INSTALL) -m 0755 eucalyptus-cloud $(DESTDIR)$(sbindir)/eucalyptus-cloud
+indent:
+ @indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
+ @\rm *.*~
+
clean:
@$(RM) -f $(OBJS) eucalyptus-cloud
14 clc/modules/cloud/build.xml
View
@@ -61,10 +61,12 @@
-->
<project name="eucalyptus-cloud" basedir=".">
- <!--================================== BUILD TARGETS ==================================-->
- <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
- <import file="../module-inc.xml" />
+ <!--================================== BUILD TARGETS ==================================-->
+ <property name="builder.suffix" value="groovy" />
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+ <import file="../module-inc.xml" />
+ <target name="indent-module">
+ </target>
</project>
2  clc/modules/cluster-manager/build.xml
View
@@ -66,4 +66,6 @@
<srcfiles dir="${src.dir}" includes="**/*" />
</uptodate>
<import file="../module-inc.xml" />
+ <target name="indent-module">
+ </target>
</project>
12 clc/modules/component/build.xml
View
@@ -61,9 +61,11 @@
-->
<project name="eucalyptus-component" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
- <import file="../module-inc.xml"/>
+ <property name="builder.suffix" value="groovy" />
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+ <import file="../module-inc.xml"/>
+ <target name="indent-module">
+ </target>
</project>
12 clc/modules/configuration/build.xml
View
@@ -61,9 +61,11 @@
-->
<project name="eucalyptus-config" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
- <import file="../module-inc.xml"/>
+ <property name="builder.suffix" value="groovy" />
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+ <import file="../module-inc.xml"/>
+ <target name="indent-module">
+ </target>
</project>
12 clc/modules/core/build.xml
View
@@ -61,9 +61,11 @@
-->
<project name="eucalyptus-core" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
- <import file="../module-inc.xml" />
+ <property name="builder.suffix" value="groovy" />
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+ <import file="../module-inc.xml" />
+ <target name="indent-module">
+ </target>
</project>
4 clc/modules/dns/build.xml
View
@@ -61,5 +61,7 @@
-->
<project name="eucalyptus-dns" basedir="." >
- <import file="../module-inc.xml"/>
+ <import file="../module-inc.xml"/>
+ <target name="indent-module">
+ </target>
</project>
12 clc/modules/euare-common/build.xml
View
@@ -61,9 +61,11 @@
-->
<project name="eucalyptus-euare-common" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
- <import file="../module-inc.xml"/>
+ <property name="builder.suffix" value="groovy" />
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+ <import file="../module-inc.xml"/>
+ <target name="indent-module">
+ </target>
</project>
12 clc/modules/euare/build.xml
View
@@ -61,9 +61,11 @@
-->
<project name="eucalyptus-euare" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
- <import file="../module-inc.xml"/>
+ <property name="builder.suffix" value="groovy" />
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+ <import file="../module-inc.xml"/>
+ <target name="indent-module">
+ </target>
</project>
4 clc/modules/module-inc.xml
View
@@ -245,6 +245,10 @@
</copy>
<antcall target="install-module" />
</target>
+ <!--================================== indent target ==================================-->
+ <target name="indent">
+ <antcall target="indent-module" />
+ </target>
<!--================================== clean target ==================================-->
<target name="clean">
<antcall target="clean-module" />
8 clc/modules/msgs/build.xml
View
@@ -61,7 +61,9 @@
-->
<project name="eucalyptus-msgs" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <import file="../module-inc.xml"/>
- <!--================================== BUILD TARGETS ==================================-->
+ <property name="builder.suffix" value="groovy" />
+ <import file="../module-inc.xml"/>
+ <!--================================== BUILD TARGETS ==================================-->
+ <target name="indent-module">
+ </target>
</project>
16 clc/modules/notifications/build.xml
View
@@ -60,10 +60,14 @@
NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS.
-->
-<project name="eucalyptus-notifications-common" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
- <import file="../module-inc.xml"/>
+<project name="eucalyptus-postgresql" basedir=".">
+ <property name="builder.suffix" value="groovy" />
+
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+
+ <import file="../module-inc.xml" />
+ <target name="indent-module">
+ </target>
</project>
14 clc/modules/postgresql/build.xml
View
@@ -61,11 +61,13 @@
-->
<project name="eucalyptus-postgresql" basedir=".">
- <property name="builder.suffix" value="groovy" />
+ <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
-
- <import file="../module-inc.xml" />
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+
+ <import file="../module-inc.xml" />
+ <target name="indent-module">
+ </target>
</project>
22 clc/modules/reporting/build.xml
View
@@ -61,16 +61,18 @@
-->
<project name="eucalyptus-reporting" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <import file="../module-inc.xml"/>
- <target name="build-csvchecker-jar" depends="builder-test">
- <echo message="${build.dir}"/>
- <jar destfile="${build.dir}/CsvChecker.jar"
+ <property name="builder.suffix" value="groovy" />
+ <import file="../module-inc.xml"/>
+ <target name="indent-module">
+ </target>
+ <target name="build-csvchecker-jar" depends="builder-test">
+ <echo message="${build.dir}"/>
+ <jar destfile="${build.dir}/CsvChecker.jar"
baseDir="${build.dir}"
includes="com/eucalyptus/reporting/CsvCheck*.class">
- <manifest>
- <attribute name="Main-Class" value="com.eucalyptus.reporting.CsvChecker"/>
- </manifest>
- </jar>
- </target>
+ <manifest>
+ <attribute name="Main-Class" value="com.eucalyptus.reporting.CsvChecker"/>
+ </manifest>
+ </jar>
+ </target>
</project>
25 clc/modules/storage-common/build.xml
View
@@ -61,16 +61,17 @@
-->
<project name="eucalyptus-storage-common" basedir=".">
- <import file="../module-inc.xml"/>
-
- <property name="euca.udev.dir" value="${euca.home}/usr/share/eucalyptus/udev" />
- <target name="install-module">
- <!-- copy udev config over -->
- <mkdir dir="${DESTDIR}${euca.udev.dir}" />
- <copy todir="${DESTDIR}${euca.udev.dir}" overwrite="true">
- <fileset dir="${basedir}/udev">
- <include name="**/*" />
- </fileset>
- </copy>
- </target>
+ <import file="../module-inc.xml"/>
+ <property name="euca.udev.dir" value="${euca.home}/usr/share/eucalyptus/udev" />
+ <target name="indent-module">
+ </target>
+ <target name="install-module">
+ <!-- copy udev config over -->
+ <mkdir dir="${DESTDIR}${euca.udev.dir}" />
+ <copy todir="${DESTDIR}${euca.udev.dir}" overwrite="true">
+ <fileset dir="${basedir}/udev">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </target>
</project>
36 clc/modules/storage-controller/build.xml
View
@@ -61,46 +61,48 @@
-->
<project name="eucalyptus-storagecontroller" basedir=".">
-
<import file="../module-inc.xml" />
<!--================================== BUILD TARGETS ==================================-->
- <property name="builder.suffix" value="jni" />
+ <target name="indent-module">
+ <native-make dir="native" target="indent" />
+ </target>
+ <property name="builder.suffix" value="jni" />
<target name="do-build-jni">
- <antcall target="build-jni"/>
+ <antcall target="build-jni" />
</target>
<target name="build-jni">
<antcall target="build-java" />
- <antcall target="jar" />
+ <antcall target="jar" />
<mkdir dir="include" />
<javah classpath="${build.dir}" destdir="include" force="yes">
<class name="com.eucalyptus.storage.OverlayManager" />
<class name="com.eucalyptus.storage.AOEManager" />
<class name="com.eucalyptus.storage.DASManager" />
</javah>
- <native-make dir="native" target="all"/>
+ <native-make dir="native" target="all" />
</target>
<target name="clean-module">
<delete dir="h" />
<delete dir="include" />
- <native-make dir="native" target="clean"/>
+ <native-make dir="native" target="clean" />
</target>
<target name="distclean-module">
- <native-make dir="native" target="distclean"/>
+ <native-make dir="native" target="distclean" />
</target>
<target name="uninstall-module">
- <native-make dir="native" target="uninstall"/>
+ <native-make dir="native" target="uninstall" />
</target>
<!--================================== install target ==================================-->
<target name="install">
- <copy todir="${DESTDIR}${euca.conf.dir}" overwrite="true">
- <fileset dir="conf">
- <include name="**/*" />
- </fileset>
- </copy>
- <copy todir="${DESTDIR}${euca.lib.dir}" overwrite="true">
- <fileset file="${jar.file}" />
- </copy>
- <native-make dir="native" target="install"/>
+ <copy todir="${DESTDIR}${euca.conf.dir}" overwrite="true">
+ <fileset dir="conf">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ <copy todir="${DESTDIR}${euca.lib.dir}" overwrite="true">
+ <fileset file="${jar.file}" />
+ </copy>
+ <native-make dir="native" target="install" />
</target>
</project>
3  clc/modules/storage-controller/native/Makefile
View
@@ -82,6 +82,9 @@ $(LIBDIR)/$(DAS_SO):
mkdir -p $(LIBDIR)
gcc -shared $(CFLAGS) -o $(LIBDIR)/$(DAS_SO) com_eucalyptus_storage_DASManager.c
+indent:
+ @indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
+ @\rm *.*~
clean:
rm -rf $(LIBDIR)
12 clc/modules/tokens/build.xml
View
@@ -19,10 +19,12 @@
additional information or have any questions.
-->
<project name="eucalyptus-tokens" basedir=".">
- <property name="builder.suffix" value="groovy" />
- <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
- <srcfiles dir="${src.dir}" includes="**/*" />
- </uptodate>
- <import file="../module-inc.xml"/>
+ <property name="builder.suffix" value="groovy" />
+ <uptodate property="groovyc.notRequired" targetfile="${jar.file}">
+ <srcfiles dir="${src.dir}" includes="**/*" />
+ </uptodate>
+ <import file="../module-inc.xml" />
+ <target name="indent-module">
+ </target>
</project>
4 clc/modules/troubleshooting/build.xml
View
@@ -61,5 +61,7 @@
-->
<project name="eucalyptus-troubleshooting" basedir="." >
- <import file="../module-inc.xml"/>
+ <import file="../module-inc.xml"/>
+ <target name="indent-module">
+ </target>
</project>
50 clc/modules/walrus/build.xml
View
@@ -61,28 +61,30 @@
-->
<project name="eucalyptus-walrus" basedir=".">
- <import file="../module-inc.xml"/>
- <property name="euca.udev.dir" value="${euca.home}/usr/share/eucalyptus/udev" />
- <target name="install">
- <copy todir="${DESTDIR}${euca.conf.dir}" overwrite="true">
- <fileset dir="conf">
- <include name="**/*" />
- </fileset>
- </copy>
- <copy todir="${DESTDIR}${euca.lib.dir}" overwrite="true">
- <fileset file="${jar.file}" />
- </copy>
- <!-- copy sample drbd config over -->
- <copy todir="${DESTDIR}${euca.etc.dir}" overwrite="true">
- <fileset dir="${basedir}/conf/drbd">
- <include name="**/*" />
- </fileset>
- </copy>
- <mkdir dir="${DESTDIR}${euca.udev.dir}" />
- <copy todir="${DESTDIR}${euca.udev.dir}" overwrite="true">
- <fileset dir="${basedir}/udev">
- <include name="**/*" />
- </fileset>
- </copy>
- </target>
+ <import file="../module-inc.xml"/>
+ <property name="euca.udev.dir" value="${euca.home}/usr/share/eucalyptus/udev" />
+ <target name="indent-module">
+ </target>
+ <target name="install">
+ <copy todir="${DESTDIR}${euca.conf.dir}" overwrite="true">
+ <fileset dir="conf">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ <copy todir="${DESTDIR}${euca.lib.dir}" overwrite="true">
+ <fileset file="${jar.file}" />
+ </copy>
+ <!-- copy sample drbd config over -->
+ <copy todir="${DESTDIR}${euca.etc.dir}" overwrite="true">
+ <fileset dir="${basedir}/conf/drbd">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ <mkdir dir="${DESTDIR}${euca.udev.dir}" />
+ <copy todir="${DESTDIR}${euca.udev.dir}" overwrite="true">
+ <fileset dir="${basedir}/udev">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ </target>
</project>
4 clc/modules/wsstack/build.xml
View
@@ -61,5 +61,7 @@
-->
<project name="eucalyptus-ws" basedir=".">
- <import file="../module-inc.xml" />
+ <import file="../module-inc.xml" />
+ <target name="indent-module">
+ </target>
</project>
99 clc/modules/www/build.xml
View
@@ -63,24 +63,26 @@
<project name="eucalyptus-www" basedir=".">
<import file="../module-inc.xml" />
<property environment="localenv"/>
- <property name="DESTDIR.0" value="${localenv.DESTDIR}"/>
- <condition property="DESTDIR" value="/" else="${localenv.DESTDIR}">
- <contains string="${DESTDIR.0}" substring="localenv"/>
- </condition>
+ <property name="DESTDIR.0" value="${localenv.DESTDIR}"/>
+ <condition property="DESTDIR" value="/" else="${localenv.DESTDIR}">
+ <contains string="${DESTDIR.0}" substring="localenv"/>
+ </condition>
<!--================================== BUILD TARGET ==================================-->
- <property name="builder.suffix" value="gwt" />
- <target name="do-build-gwt">
- <antcall target="build-gwt"/>
- </target>
- <target name="build-gwt">
- <echo message="gwtDebug=${gwtDebug}"/>
- <antcall target="compile-src" />
- <antcall target="jar" />
- <condition property="gwtBuildType" value="debug" else="normal" >
- <isset property="gwtDebug"/>
- </condition>
- <antcall target="compile-gwt-${gwtBuildType}" />
+ <target name="indent-module">
+ </target>
+ <property name="builder.suffix" value="gwt" />
+ <target name="do-build-gwt">
+ <antcall target="build-gwt"/>
+ </target>
+ <target name="build-gwt">
+ <echo message="gwtDebug=${gwtDebug}"/>
+ <antcall target="compile-src" />
+ <antcall target="jar" />
+ <condition property="gwtBuildType" value="debug" else="normal" >
+ <isset property="gwtDebug"/>
+ </condition>
+ <antcall target="compile-gwt-${gwtBuildType}" />
</target>
<!--================================== GWT-ONLY TARGET ==================================-->
<property environment="env" />
@@ -89,18 +91,18 @@
<include name="**/*.jar" />
</fileset>
<pathelement path="conf" />
- <dirset dir="${modules.dir}">
- <include name="**/build"/>
- </dirset>
+ <dirset dir="${modules.dir}">
+ <include name="**/build"/>
+ </dirset>
</path>
<path id="gwtcompilerclasspath">
<fileset dir="${lib.dir}">
<include name="**/gwt-dev.jar" />
</fileset>
<path refid="gwtclasspath" />
- <dirset dir="${modules.dir}">
- <include name="**/build"/>
- </dirset>
+ <dirset dir="${modules.dir}">
+ <include name="**/build"/>
+ </dirset>
<pathelement path="${src.dir}" />
</path>
<property name="gwt.build.dir" value="build" />
@@ -119,8 +121,8 @@
</target>
<target name="compile-src">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${test.dir}"/>
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${test.dir}"/>
<javac deprecation="false" srcdir="${src.dir}" destdir="${build.dir}" classpathref="gwtclasspath" failonerror="true" debug="true" target="1.5" />
</target>
@@ -132,20 +134,20 @@
</target>
- <target name="compile-gwt-normal" depends="check-src" unless="gwtc.notRequired">
- <delete dir="${gwt.war.build.dir}" />
- <mkdir dir="${gwt.war.build.dir}" />
- <mkdir dir="${gwt.war.dir}" />
- <java classpathref="gwtcompilerclasspath" fork="true" failonerror="true" classname="com.google.gwt.dev.Compiler">
- <jvmarg value="-Xmx1024m" />
- <jvmarg value="-Xss1024k" />
- <arg line="-war ${gwt.war.build.dir}" />
- <arg line="com.eucalyptus.webui.EucalyptusWebInterface" />
- </java>
- <war destfile="${gwt.war}" webxml="${conf.dir}/gwt-web.xml" basedir="${gwt.war.build.dir}/${gwt.module.rename}/" />
- </target>
-
- <target name="compile-gwt-debug" depends="check-src" unless="gwtc.notRequired">
+ <target name="compile-gwt-normal" depends="check-src" unless="gwtc.notRequired">
+ <delete dir="${gwt.war.build.dir}" />
+ <mkdir dir="${gwt.war.build.dir}" />
+ <mkdir dir="${gwt.war.dir}" />
+ <java classpathref="gwtcompilerclasspath" fork="true" failonerror="true" classname="com.google.gwt.dev.Compiler">
+ <jvmarg value="-Xmx1024m" />
+ <jvmarg value="-Xss1024k" />
+ <arg line="-war ${gwt.war.build.dir}" />
+ <arg line="com.eucalyptus.webui.EucalyptusWebInterface" />
+ </java>
+ <war destfile="${gwt.war}" webxml="${conf.dir}/gwt-web.xml" basedir="${gwt.war.build.dir}/${gwt.module.rename}/" />
+ </target>
+
+ <target name="compile-gwt-debug" depends="check-src" unless="gwtc.notRequired">
<delete dir="${gwt.war.build.dir}" />
<mkdir dir="${gwt.war.build.dir}" />
<mkdir dir="${gwt.war.dir}" />
@@ -154,7 +156,8 @@
<jvmarg value="-Xss1024k" />
<arg line="-war ${gwt.war.build.dir}" />
<arg line="-draftCompile"/>
- <arg line="-style DETAILED"/> <!-- PRETTY for non-obfuscated Javascript -->
+ <arg line="-style DETAILED"/>
+ <!-- PRETTY for non-obfuscated Javascript -->
<arg line="com.eucalyptus.webui.EucalyptusWebInterface" />
</java>
<war destfile="${gwt.war}" webxml="${conf.dir}/gwt-web.xml" basedir="${gwt.war.build.dir}/${gwt.module.rename}/" />
@@ -162,16 +165,14 @@
<property name="servlet.dir" value="${euca.var.dir}/webapps" />
<target name="install">
- <copy todir="${DESTDIR}${euca.conf.dir}" overwrite="true">
- <fileset dir="conf">
- <include name="**/*" />
- </fileset>
- </copy>
- <copy todir="${DESTDIR}${euca.lib.dir}" overwrite="true">
- <fileset file="${jar.file}" />
- </copy>
+ <copy todir="${DESTDIR}${euca.conf.dir}" overwrite="true">
+ <fileset dir="conf">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ <copy todir="${DESTDIR}${euca.lib.dir}" overwrite="true">
+ <fileset file="${jar.file}" />
+ </copy>
<copy overwrite="true" file="${gwt.war}" todir="${DESTDIR}${servlet.dir}" />
</target>
-
-
</project>
6 node/Makefile
View
@@ -202,13 +202,13 @@ deploy:
# no ws
# cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
-clean:
- rm -rf $(SERVICE_SO) *.o $(CLIENT) $(CLIENT)_local *~* *#* test_xml
-
indent:
@indent *.[ch] -nbad -bap -nbc -bbo -hnl -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -d0 -di1 -nfc1 -i4 -ut -ip0 -l200 -lp -npcs -nprs -npsl -sai -saf -saw -ncs -nsc -sob -nfca -ss -ts4 -il0 -nip
@\rm *.*~
+clean:
+ rm -rf $(SERVICE_SO) *.o $(CLIENT) $(CLIENT)_local *~* *#* test_xml
+
distclean:
rm -rf generated $(SERVICE_SO) *.o $(CLIENT) $(CLIENT)_local nc-client-policy.xml test test_nc test_hooks *~* *#*
Please sign in to comment.
Something went wrong with that request. Please try again.