Instructions Jenkins Doxygen

[added] idlc will automatically add generated files to Makefile.am 35/935/1
authorVictor Popovici <theanswer@swgemu.com>
Wed, 16 Oct 2013 20:28:47 +0000 (22:28 +0200)
committerVictor Popovici <theanswer@swgemu.com>
Wed, 16 Oct 2013 20:28:47 +0000 (22:28 +0200)
Change-Id: I416174c6b52aa9bfe4296660a02dc10cc45664b6

MMOCoreORB/Makefile
MMOCoreORB/src/Makefile.am
MMOCoreORB/src/server/zone/objects/player/sessions/StructureStatusSession.idl

index f86d738..7a0846d 100644 (file)
@@ -44,7 +44,7 @@ IDLC = /usr/local/bin/idlc
                                
 IDL_CLASSPATH = ../MMOEngine/include
 
-IDL_DIRECTIVES = -outdir autogen -cp $(IDL_CLASSPATH)
+IDL_DIRECTIVES = -makefile src/Makefile.am -outdir autogen -cp $(IDL_CLASSPATH)
 
 UNITTEST_DIRECTIVES = 
 
@@ -53,7 +53,7 @@ all: #build
        #cp build/unix/src/core3 bin
 
 build: idl gtest
-       cd build/unix && make -j4 UNITTEST_DIRECTIVES="$(UNITTEST_DIRECTIVES)"
+       cd build/unix && make -j4 UNITTEST_DIRECTIVES="$(UNITTEST_DIRECTIVES)" #CC=clang CXX=clang++
        cp build/unix/src/client/core3* bin
        cp build/unix/src/core3* bin
        #cd bin/conf && svnversion > rev.txt
index 3ffbbbd..505862e 100644 (file)
@@ -95,7 +95,8 @@ core3_TESTS =         server/zone/objects/area/areashapes/tests/CircularAreaShapeTest.c
                                server/zone/objects/terrain/tests/BasicTerrainTest.cpp \
                                server/zone/tests/ZoneTest.cpp
 
-core3_IDLS =   autogen/server/zone/objects/player/sessions/ImageDesignPositionObserver.cpp \
+core3_IDLS =   autogen/server/zone/objects/player/sessions/StructureStatusSession.cpp \
+                               autogen/server/zone/objects/player/sessions/ImageDesignPositionObserver.cpp \
                                autogen/server/zone/objects/area/FsVillageArea.cpp \
                                autogen/server/zone/objects/player/sessions/TradeSession.cpp \
                                autogen/server/zone/objects/tangible/powerup/PowerupObject.cpp \
@@ -760,4 +761,4 @@ core3_SOURCES =     $(core3_IDLS) \
 #              server/zone/managers/object/UpdateModifiedObjectsThread.cpp \
 #              server/zone/objects/scene/SceneObject.cpp \
 #              server/zone/objects/scene/SceneObjectImplementation.cpp
-               
+               
\ No newline at end of file
index 34d43dd..2151d85 100644 (file)
@@ -46,6 +46,7 @@ package server.zone.objects.player.sessions;
 
 import engine.util.Facade;
 include server.zone.objects.scene.SessionFacadeType;
+import server.zone.objects.structure.StructureObject;
 
 class StructureStatusSession extends Facade {
        @weakReference