Menu
▾
▴
[Mevislabmodules-svn] SF.net SVN: mevislabmodules:[376] trunk/Community/General/Modules/Macros/ Build
|
From: <mva...@us...> - 2011-09-08 18:21:38
|
Revision: 376
http://mevislabmodules.svn.sourceforge.net/mevislabmodules/?rev=376&view=rev
Author: mvanstralen
Date: 2011-09-08 18:21:30 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Support for Visual Studio 2010 and XCode
Modified Paths:
--------------
trunk/Community/General/Modules/Macros/Build/BuildProjects.def
trunk/Community/General/Modules/Macros/Build/BuildProjects.mlab
trunk/Community/General/Modules/Macros/Build/BuildProjects.py
trunk/Community/General/Modules/Macros/Build/BuildProjects.script
Modified: trunk/Community/General/Modules/Macros/Build/BuildProjects.def
===================================================================
--- trunk/Community/General/Modules/Macros/Build/BuildProjects.def 2011-08-27 13:04:31 UTC (rev 375)
+++ trunk/Community/General/Modules/Macros/Build/BuildProjects.def 2011-09-08 18:21:30 UTC (rev 376)
@@ -1,49 +1,21 @@
-//
-// Copyright (c) 2011, Image Sciences Institute, UMC Utrecht.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-// * Neither the name of ISI nor the names of its contributors
-// may be used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL ISI BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//----------------------------------------------------------------------------------
-//! BuildProjects module definition
-/*!
-// \file BuildProjects.def
-// \author Marijn van Stralen
-// \date 2010-09-20
-*/
-//----------------------------------------------------------------------------------
-
-MacroModule BuildProjects {
- genre = "Special"
- group = ISI
- author = "Marijn van Stralen"
- status = "work-in-progress"
- comment = "Builds all mevislab projects in a directory (windows only)"
- keywords = "Visual studio, build, compile, batch"
- seeAlso = ""
- exampleNetwork = "$(LOCAL)/networks/BuildProjectsExample.mlab"
-
- externalDefinition = "$(LOCAL)/BuildProjects.script"
-
-} // MacroModule BuildProjects
-
+//----------------------------------------------------------------------------------
+//! BuildProjects module definition
+/*!
+// \file BuildProjects.def
+// \author Marijn van Stralen
+// \date 2010-09-20
+*/
+//----------------------------------------------------------------------------------
+
+MacroModule BuildProjects {
+ genre = "Special"
+ author = "Marijn van Stralen"
+ status = "work-in-progress"
+ comment = "Builds all mevislab projects in a directory (windows only)"
+ keywords = "Visual studio, build, compile, batch"
+ seeAlso = ""
+ exampleNetwork = "$(LOCAL)/networks/BuildProjectsExample.mlab"
+ externalDefinition = "$(LOCAL)/BuildProjects.script"
+
+} // MacroModule BuildProjects
+
Modified: trunk/Community/General/Modules/Macros/Build/BuildProjects.mlab
===================================================================
--- trunk/Community/General/Modules/Macros/Build/BuildProjects.mlab 2011-08-27 13:04:31 UTC (rev 375)
+++ trunk/Community/General/Modules/Macros/Build/BuildProjects.mlab 2011-09-08 18:21:30 UTC (rev 376)
@@ -2,21 +2,242 @@
network {
watchlist = ""
}
+module StringUtils {
+ internal {
+ frame = "974 -171 104 56"
+ moduleGroupName = XCode
+ windows {
+ window _default {
+ geometry = "930 353 622 250"
+ sizeHint = "268 214"
+ wasOpen = yes
+ }
+ }
+ }
+ fields {
+ instanceName = StringUtils7
+ operationType = Replace
+ string1 = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.pro
+ string2 = .pro
+ string3 = _debug.xcodeproj
+ string4 = ""
+ string5 = ""
+ string6 = ""
+ stringPrefix = [
+ stringPostfix = ]
+ toggle1 = TRUE
+ toggle2 = TRUE
+ toggle3 = FALSE
+ toggle4 = FALSE
+ toggle5 = FALSE
+ toggle6 = FALSE
+ togglePrefix = FALSE
+ togglePostfix = FALSE
+ separator = ""
+ selectSeparator = 0
+ toggleIgnoreCase = FALSE
+ inPos1 = 0
+ inPos2 = 0
+ }
+}
+module StringUtils {
+ internal {
+ frame = "974 -111 104 56"
+ moduleGroupName = XCode
+ windows {
+ window _default {
+ geometry = "158 894 927 324"
+ sizeHint = "409 324"
+ wasOpen = yes
+ }
+ }
+ }
+ fields {
+ instanceName = StringUtils6
+ operationType = Concatenate
+ string1 = "-project "
+ string2 = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse_debug.xcodeproj
+ string3 = " -alltargets"
+ string4 = ""
+ string5 = ""
+ string6 = ""
+ stringPrefix = [
+ stringPostfix = ]
+ toggle1 = TRUE
+ toggle2 = TRUE
+ toggle3 = TRUE
+ toggle4 = FALSE
+ toggle5 = FALSE
+ toggle6 = FALSE
+ togglePrefix = FALSE
+ togglePostfix = FALSE
+ separator = ""
+ selectSeparator = 0
+ toggleIgnoreCase = FALSE
+ inPos1 = 0
+ inPos2 = 0
+ }
+}
+module CallApplication {
+ internal {
+ frame = "761 -143 176 64"
+ moduleGroupName = XCode
+ windows {
+ window _default {
+ geometry = "1038 722 888 431"
+ sizeHint = "284 431"
+ wasOpen = yes
+ }
+ }
+ }
+ fields {
+ instanceName = buildXCodeProjectDebug
+ executable = /Developer/usr/bin/xcodebuild
+ arguments = "-project /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse_debug.xcodeproj -alltargets"
+ workingDirectory = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/
+ outputToLogWindow = FALSE
+ logWindow = ""
+ callSucceeded = TRUE
+ macOSXMode = TRUE
+ }
+}
+module CallApplication {
+ internal {
+ frame = "769 -47 144 64"
+ moduleGroupName = XCode
+ windows {
+ window _default {
+ geometry = "1038 722 888 431"
+ sizeHint = "284 431"
+ wasOpen = yes
+ }
+ }
+ }
+ fields {
+ instanceName = buildXCodeProject
+ executable = /Developer/usr/bin/xcodebuild
+ arguments = "-project /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.xcodeproj -alltargets"
+ workingDirectory = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/
+ outputToLogWindow = FALSE
+ logWindow = ""
+ callSucceeded = TRUE
+ macOSXMode = TRUE
+ }
+}
+module StringUtils {
+ internal {
+ frame = "965 37 104 56"
+ moduleGroupName = XCode
+ windows {
+ window _default {
+ geometry = "474 588 622 250"
+ sizeHint = "268 214"
+ wasOpen = yes
+ }
+ }
+ }
+ fields {
+ instanceName = StringUtils5
+ operationType = Replace
+ string1 = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.pro
+ string2 = .pro
+ string3 = .xcodeproj
+ string4 = ""
+ string5 = ""
+ string6 = ""
+ stringPrefix = [
+ stringPostfix = ]
+ toggle1 = TRUE
+ toggle2 = TRUE
+ toggle3 = FALSE
+ toggle4 = FALSE
+ toggle5 = FALSE
+ toggle6 = FALSE
+ togglePrefix = FALSE
+ togglePostfix = FALSE
+ separator = ""
+ selectSeparator = 0
+ toggleIgnoreCase = FALSE
+ inPos1 = 0
+ inPos2 = 0
+ }
+}
+module StringUtils {
+ internal {
+ frame = "966 -43 104 56"
+ moduleGroupName = XCode
+ windows {
+ window _default {
+ geometry = "161 703 409 324"
+ sizeHint = "409 324"
+ wasOpen = yes
+ }
+ }
+ }
+ fields {
+ instanceName = StringUtils4
+ operationType = Concatenate
+ string1 = "-project "
+ string2 = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.xcodeproj
+ string3 = " -alltargets"
+ string4 = ""
+ string5 = ""
+ string6 = ""
+ stringPrefix = [
+ stringPostfix = ]
+ toggle1 = TRUE
+ toggle2 = TRUE
+ toggle3 = TRUE
+ toggle4 = FALSE
+ toggle5 = FALSE
+ toggle6 = FALSE
+ togglePrefix = FALSE
+ togglePostfix = FALSE
+ separator = ""
+ selectSeparator = 0
+ toggleIgnoreCase = FALSE
+ inPos1 = 0
+ inPos2 = 0
+ }
+}
+module CallApplication {
+ internal {
+ frame = "769 25 144 64"
+ moduleGroupName = XCode
+ windows {
+ window _default {
+ geometry = "73 653 315 431"
+ sizeHint = "284 431"
+ wasOpen = yes
+ }
+ }
+ }
+ fields {
+ instanceName = createXCodeProject
+ executable = /Applications/MeVisLab.app/Contents/Support/MeVisLabProjectGenerator.app/Contents/MacOS/MeVisLabProjectGenerator
+ arguments = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.pro
+ workingDirectory = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/
+ outputToLogWindow = FALSE
+ logWindow = ""
+ callSucceeded = TRUE
+ macOSXMode = TRUE
+ }
+}
module FileDirectory {
internal {
- frame = "493 377 104 64"
+ frame = "489 377 112 64"
moduleGroupName = ""
windows {
window _default {
- geometry = "296 463 501 558"
- sizeHint = "501 566"
+ geometry = "1034 483 972 586"
+ sizeHint = "540 586"
wasOpen = no
}
}
}
fields {
instanceName = proFiles
- rootPath = D:/Documents/Mevislab/Packages22/ISI/ThirdParty
+ rootPath = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML
recursive = TRUE
maxRecursionDepth = -1
fileType = Files
@@ -27,21 +248,43 @@
exclude = ""
excludeRegExp = FALSE
ignoreCase = TRUE
- fileList = "D:\\Documents\\Mevislab\\Packages22\\ISI\\ThirdParty/Sources/ann_1.1.2/ANN.pro
-D:\\Documents\\Mevislab\\Packages22\\ISI\\ThirdParty/Sources/fann-2.1.0/fann.pro
-D:\\Documents\\Mevislab\\Packages22\\ISI\\ThirdParty/Sources/gpc/gpc.pro
-D:\\Documents\\Mevislab\\Packages22\\ISI\\ThirdParty/Sources/StealthLinkLibrary/StealthLinkLibrary.pro"
+ fileList = "/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIAAMPoseArrayToMatrix/ISIAAMPoseArrayToMatrix.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIAAMSampleANNLabelArray/ISIAAMSampleANNLabelArray.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIAAMSampleANNPointArray/ISIAAMSampleANNPointArray.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIBuildTextureLookupImage/ISIBuildTextureLookupImage.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIComputeCostsHierarchicalPCAStatisticalShapeModel/ISIComputeCostsHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIComputeCumCostsHierarchicalPCAStatisticalShapeModel/ISIComputeCumCostsHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISICreateAppearance/ISICreateAppearance.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIDecorateHierarchicalPCAStatisticalShapeModel/ISIDecorateHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIGraphCutShapeMatch/ISIGraphCutShapeMatch.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIHierarchicalPCAStatisticalShapeModel/ISIHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIHierarchicalPCAStatisticalShapeModelToPolyData/ISIHierarchicalPCAStatisticalShapeModelToPolyData.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIHierarchicalPolyDataFilter/ISIHierarchicalPolyDataFilter.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageToVTKPolyData/ISIImageToVTKPolyData.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIMatrixMultiplicationOfImages/ISIMatrixMultiplicationOfImages.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIPCAStatisticalShapeModel/ISIPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIProcrustesAlignmentFilter/ISIProcrustesAlignmentFilter.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIProjectPointsOnVTKPolyData/ISIProjectPointsOnVTKPolyData.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIRegularizeHierarchicalPCAStatisticalShapeModel/ISIRegularizeHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISISample1DTextureAtSurfacePoints/ISISample1DTextureAtSurfacePoints.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISISampleTextureWithLookup/ISISampleTextureWithLookup.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISITransformHierarchicalPCAStatisticalShapeModel/ISITransformHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIVTKArrayVTKPolyDataVV/ISIVTKArrayVTKPolyDataVV.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIVTKPolyDataAddWhiskers/ISIVTKPolyDataAddWhiskers.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIVTKPolyDataRemoveWhiskers/ISIVTKPolyDataRemoveWhiskers.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIVTKPolyDataToImage/ISIVTKPolyDataToImage.pro"
dirMode = Absolute
}
}
module StringUtils {
internal {
- frame = "333 165 88 56"
- moduleGroupName = ""
+ frame = "273 21 96 56"
+ moduleGroupName = VisualStudio
windows {
window _default {
- geometry = "190 690 983 331"
- sizeHint = "370 331"
+ geometry = "190 690 834 324"
+ sizeHint = "409 324"
wasOpen = no
}
}
@@ -52,7 +295,7 @@
string1 = /
string2 = Build
string3 = " release "
- string4 = ""
+ string4 = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.vcproj
string5 = ""
string6 = ""
stringPrefix = [
@@ -74,8 +317,8 @@
}
module CallApplication {
internal {
- frame = "481 161 112 64"
- moduleGroupName = ""
+ frame = "421 17 120 64"
+ moduleGroupName = VisualStudio
windows {
window _default {
geometry = "255 275 1110 364"
@@ -86,22 +329,22 @@
}
fields {
instanceName = buildRelease
- executable = "C:/Program Files (x86)/Microsoft Visual Studio 8/Common7/IDE/devenv.exe"
- arguments = "/Build release "
- workingDirectory = ""
+ executable = ""
+ arguments = "/Build release /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.vcproj"
+ workingDirectory = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/
outputToLogWindow = FALSE
logWindow = ""
- callSucceeded = TRUE
+ callSucceeded = FALSE
}
}
module StringUtils {
internal {
- frame = "329 317 96 56"
- moduleGroupName = ""
+ frame = "349 157 104 56"
+ moduleGroupName = VisualStudio
windows {
window _default {
- geometry = "299 280 1076 331"
- sizeHint = "234 204"
+ geometry = "299 280 320 247"
+ sizeHint = "268 214"
wasOpen = no
}
}
@@ -109,7 +352,7 @@
fields {
instanceName = StringUtils1
operationType = Replace
- string1 = ""
+ string1 = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.pro
string2 = .pro
string3 = .vcproj
string4 = ""
@@ -134,12 +377,12 @@
}
module StringUtils {
internal {
- frame = "329 229 96 56"
- moduleGroupName = ""
+ frame = "269 85 104 56"
+ moduleGroupName = VisualStudio
windows {
window _default {
- geometry = "235 600 1076 331"
- sizeHint = "234 204"
+ geometry = "235 600 268 214"
+ sizeHint = "268 214"
wasOpen = no
}
}
@@ -147,7 +390,7 @@
fields {
instanceName = StringUtils2
operationType = Replace
- string1 = ""
+ string1 = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.pro
string2 = .pro
string3 = .bat
string4 = ""
@@ -172,30 +415,52 @@
}
module FieldIterator {
internal {
- frame = "497 313 96 64"
+ frame = "495 316 104 64"
moduleGroupName = ""
windows {
window _default {
- geometry = "948 286 408 299"
- sizeHint = "408 299"
- wasOpen = no
+ geometry = "1301 187 995 311"
+ sizeHint = "418 311"
+ wasOpen = yes
}
}
}
fields {
instanceName = projectIter
fieldNames = ""
- fieldValues = "D:\\Documents\\Mevislab\\Packages22\\ISI\\ThirdParty/Sources/ann_1.1.2/ANN.pro
-D:\\Documents\\Mevislab\\Packages22\\ISI\\ThirdParty/Sources/fann-2.1.0/fann.pro
-D:\\Documents\\Mevislab\\Packages22\\ISI\\ThirdParty/Sources/gpc/gpc.pro
-D:\\Documents\\Mevislab\\Packages22\\ISI\\ThirdParty/Sources/StealthLinkLibrary/StealthLinkLibrary.pro"
+ fieldValues = "/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIAAMPoseArrayToMatrix/ISIAAMPoseArrayToMatrix.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIAAMSampleANNLabelArray/ISIAAMSampleANNLabelArray.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIAAMSampleANNPointArray/ISIAAMSampleANNPointArray.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIBuildTextureLookupImage/ISIBuildTextureLookupImage.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIComputeCostsHierarchicalPCAStatisticalShapeModel/ISIComputeCostsHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIComputeCumCostsHierarchicalPCAStatisticalShapeModel/ISIComputeCumCostsHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISICreateAppearance/ISICreateAppearance.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIDecorateHierarchicalPCAStatisticalShapeModel/ISIDecorateHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIGraphCutShapeMatch/ISIGraphCutShapeMatch.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIHierarchicalPCAStatisticalShapeModel/ISIHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIHierarchicalPCAStatisticalShapeModelToPolyData/ISIHierarchicalPCAStatisticalShapeModelToPolyData.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIHierarchicalPolyDataFilter/ISIHierarchicalPolyDataFilter.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageToVTKPolyData/ISIImageToVTKPolyData.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIMatrixMultiplicationOfImages/ISIMatrixMultiplicationOfImages.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIPCAStatisticalShapeModel/ISIPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIProcrustesAlignmentFilter/ISIProcrustesAlignmentFilter.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIProjectPointsOnVTKPolyData/ISIProjectPointsOnVTKPolyData.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIRegularizeHierarchicalPCAStatisticalShapeModel/ISIRegularizeHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISISample1DTextureAtSurfacePoints/ISISample1DTextureAtSurfacePoints.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISISampleTextureWithLookup/ISISampleTextureWithLookup.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISITransformHierarchicalPCAStatisticalShapeModel/ISITransformHierarchicalPCAStatisticalShapeModel.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIVTKArrayVTKPolyDataVV/ISIVTKArrayVTKPolyDataVV.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIVTKPolyDataAddWhiskers/ISIVTKPolyDataAddWhiskers.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIVTKPolyDataRemoveWhiskers/ISIVTKPolyDataRemoveWhiskers.pro
+/Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIVTKPolyDataToImage/ISIVTKPolyDataToImage.pro"
fieldSeparator = [,;]
valueSeparator = "\\n"
valueHeader = FALSE
- numValues = 4
+ numValues = 26
indexTranslation = 0
- curIndex = -1
- curValue = ""
+ curIndex = 12
+ curValue = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.pro
newValueEnable = FALSE
verbose = FALSE
delay = 1
@@ -206,36 +471,36 @@
}
module FileInformation {
internal {
- frame = "665 317 112 56"
+ frame = "662 318 120 56"
moduleGroupName = ""
windows {
window _default {
- geometry = "601 237 655 306"
- sizeHint = "236 306"
+ geometry = "422 230 534 402"
+ sizeHint = "309 402"
wasOpen = no
}
}
}
fields {
instanceName = FileInformation
- path = ""
- dirname = ""
- filename = ""
- basename = ""
- extension = ""
- type = ""
- size = 0
- createDate = ""
- exists = FALSE
+ path = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.pro
+ dirname = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/
+ filename = ISIImageMatrixInverse.pro
+ basename = ISIImageMatrixInverse
+ extension = .pro
+ type = File
+ size = 1417
+ createDate = 2011-08-17T11:26:23
+ exists = TRUE
isDirectory = FALSE
- isReadable = FALSE
- isWritable = FALSE
+ isReadable = TRUE
+ isWritable = TRUE
}
}
module CallApplication {
internal {
- frame = "481 97 112 64"
- moduleGroupName = ""
+ frame = "421 -47 120 64"
+ moduleGroupName = VisualStudio
windows {
window _default {
geometry = "200 217 1057 364"
@@ -246,18 +511,18 @@
}
fields {
instanceName = buildDebug
- executable = "C:/Program Files (x86)/Microsoft Visual Studio 8/Common7/IDE/devenv.exe"
- arguments = "/Build debug "
- workingDirectory = ""
+ executable = ""
+ arguments = "/Rebuild debug /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.vcproj"
+ workingDirectory = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/
outputToLogWindow = FALSE
logWindow = ""
- callSucceeded = TRUE
+ callSucceeded = FALSE
}
}
module StringUtils {
internal {
- frame = "329 101 96 56"
- moduleGroupName = ""
+ frame = "269 -43 104 56"
+ moduleGroupName = VisualStudio
windows {
window _default {
geometry = "193 246 1075 331"
@@ -270,9 +535,9 @@
instanceName = StringUtils3
operationType = Concatenate
string1 = /
- string2 = Build
+ string2 = Rebuild
string3 = " debug "
- string4 = ""
+ string4 = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.vcproj
string5 = "*"*"
string6 = ""
stringPrefix = [
@@ -294,27 +559,36 @@
}
module CallApplication {
internal {
- frame = "481 225 112 64"
- moduleGroupName = ""
+ frame = "421 81 120 64"
+ moduleGroupName = VisualStudio
windows {
window _default {
- geometry = "939 406 717 364"
- sizeHint = "277 364"
+ geometry = "495 755 1047 404"
+ sizeHint = "284 404"
wasOpen = no
}
}
}
fields {
instanceName = callBAT
- executable = ""
+ executable = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/ISIImageMatrixInverse.bat
arguments = ""
- workingDirectory = ""
+ workingDirectory = /Users/admin/Documents/MeVisLab/Packages22/ISI/StatisticalModeling/Sources/ML/ISIImageMatrixInverse/
outputToLogWindow = FALSE
logWindow = ""
callSucceeded = FALSE
}
}
connections {
+ StringUtils7.string1 = projectIter.curValue
+ StringUtils6.string2 = StringUtils7.result
+ buildXCodeProjectDebug.arguments = StringUtils6.result
+ buildXCodeProject.arguments = StringUtils4.result
+ buildXCodeProject.workingDirectory = FileInformation.dirname
+ StringUtils5.string1 = projectIter.curValue
+ StringUtils4.string2 = StringUtils5.result
+ createXCodeProject.arguments = projectIter.curValue
+ createXCodeProject.workingDirectory = FileInformation.dirname
StringUtils.string4 = StringUtils1.result
buildRelease.arguments = StringUtils.result
buildRelease.workingDirectory = FileInformation.dirname
@@ -328,4 +602,34 @@
callBAT.executable = StringUtils2.result
callBAT.workingDirectory = FileInformation.dirname
}
-networkModel = ""
+networkModel {
+ parentItems {
+ 0 {
+ MLABNetworkModelItem MLABNetworkModelItemGroup {
+ uniqueId = 34
+ objectName = VisualStudio
+ parentUniqueId = 0
+ frame = "244 -122 322 360"
+ color {
+ r = 45
+ g = 226
+ b = 226
+ a = 40
+ }
+ }
+ MLABNetworkModelItem MLABNetworkModelItemGroup {
+ uniqueId = 58
+ objectName = XCode
+ parentUniqueId = 0
+ frame = "736 -246 367 364"
+ color {
+ r = 45
+ g = 226
+ b = 226
+ a = 40
+ }
+ }
+ }
+ }
+}
+
Modified: trunk/Community/General/Modules/Macros/Build/BuildProjects.py
===================================================================
--- trunk/Community/General/Modules/Macros/Build/BuildProjects.py 2011-08-27 13:04:31 UTC (rev 375)
+++ trunk/Community/General/Modules/Macros/Build/BuildProjects.py 2011-09-08 18:21:30 UTC (rev 376)
@@ -31,6 +31,7 @@
import string;
import codecs
+
def init():
ctx.field("directory").value = MLABPackageManager.packageByIdentifier("ISI/General").path().replace("/General", "")
directoryChanged();
@@ -38,12 +39,124 @@
ctx.field("projectFiles").value = "Create";
ctx.field("debug").value = "Build";
ctx.field("release").value = "Build";
+ ctx.field("projectFilesXCode").value = "Create";
+ ctx.field("debugXCode").value = "Build";
+ ctx.field("releaseXCode").value = "Build";
def directoryChanged():
ctx.field("proFiles.update").touch();
return;
+
+def runBatchXCode():
+ buildResults = [];
+ noBatchFile = [];
+ noProjectFile = [];
+ ctx.field("progress").value = 0.0;
+ for i in range(0, ctx.field("projectIter.numValues").value, 1):
+ ctx.field("projectIter.curIndex").value = i;
+ projFile = ctx.field("projectIter.curValue").value;
+ basename = ctx.field("FileInformation.basename").value;
+ xcodeFile = ctx.field("StringUtils5.result").value;
+ if ctx.field("projectFilesXCode").value == "Recreate":
+ if MLABFileManager.exists(projFile): #project batch file
+ ctx.field("createXCodeProject.call").touch();
+ else:
+ print "Error on project " + basename + ": Could not find pro file " + projFile;
+ #noBatchFile += [basename];
+ elif ctx.field("projectFilesXCode").value == "Create":
+ if not MLABFileManager.exists(xcodeFile):
+ #print "proj file does not exist: call bat file"
+ if MLABFileManager.exists(projFile): #project batch file
+ ctx.field("createXCodeProject.call").touch();
+ else:
+ print "Error on project " + basename + ": Could not find xcode file " + xcodeFile;
+ noProjectFile += [basename];
+ elif MLABFileManager.getLastModifiedDate(ctx.field("projectIter.curValue").value) > MLABFileManager.getLastModifiedDate(xcodeFile):
+ #print "pro file is newer: call bat file"
+ ctx.field("createXCodeProject.call").touch();
+ if MLABFileManager.exists(xcodeFile): #visual studio project file
+ if ctx.field("releaseXCode").value <> "Skip":
+ ctx.field("buildXCodeProject.call").touch();
+ if ctx.field("releaseXCode").value <> "Clear":
+ ret = checkBuildSuccessfulXCode("Release");
+ buildResults += [ret];
+ if ctx.field("debugXCode").value <> "Skip":
+ ctx.field("buildXCodeProjectDebug.call").touch();
+ if ctx.field("debugXCode").value <> "Clear":
+ ret = checkBuildSuccessfulXCode("Debug");
+ buildResults += [ret];
+ else:
+ print "Error on project " + basename + ": Could not find xcode file " + xcodeFile;
+ noProjectFile += [basename];
+ ctx.field("progress").value = (i+1.0)/ctx.field("projectIter.numValues").value;
+ print "Build batch completed";
+ #print buildResults;
+ debugWithErrors = [];
+ releaseWithErrors = [];
+ debugWithWarnings = [];
+ releaseWithWarnings = [];
+ for b in buildResults:
+ if len(b)>0:
+ if b[1] == 'Debug' and b[2] > 0:
+ debugWithErrors += [b[0]];
+ elif b[1] == 'Release' and b[2] > 0:
+ releaseWithErrors += [b[0]];
+ if b[1] == 'Debug' and b[3] > 0:
+ debugWithWarnings += [b[0]];
+ elif b[1] == 'Release' and b[3] > 0:
+ releaseWithWarnings += [b[0]];
+ if ctx.field("releaseXCode").value == "Build" or ctx.field("releaseXCode").value == "Rebuild":
+ print "-- VCProject files ---";
+ print "The following projects had no visual studio project file (", len(noProjectFile), "):";
+ if len(noProjectFile)==0:
+ print "<none>";
+ else:
+ for p in noProjectFile:
+ print p;
+ print "------------------------\n";
+ #if ctx.field("debug").value == "Build" or ctx.field("debug").value == "Rebuild":
+ print "------- Debug --------";
+ print "The following projects had errors (", len(debugWithErrors), "):";
+ if len(debugWithErrors)==0:
+ print "<none>";
+ else:
+ for p in debugWithErrors:
+ print p;
+ print "The following projects had warnings (", len(debugWithWarnings), "):";
+ if len(debugWithWarnings)==0:
+ print "<none>";
+ else:
+ for p in debugWithWarnings:
+ print p;
+ print "------------------------\n";
+ #if ctx.field("release").value == "Build" or ctx.field("release").value == "Rebuild":
+ ''' print "------- Release --------";
+ print "The following projects had errors (", len(releaseWithErrors), "):";
+ if len(releaseWithErrors)==0:
+ print "<none>";
+ else:
+ for p in releaseWithErrors:
+ print p;
+ print "The following projects had warnings (", len(releaseWithWarnings), "):";
+ if len(releaseWithWarnings)==0:
+ print "<none>";
+ else:
+ for p in releaseWithWarnings:
+ print p;
+ print "------------------------\n"; '''
+ return;
+
+def runBatch2005():
+ runBatch(2005);
-def runBatch():
+def runBatch2010():
+ runBatch(2010);
+
+def runBatch(vsversion):
+ if (vsversion == 2005):
+ ctx.field("StringUtils1.string3").value = ".vcproj";
+ elif (vsversion == 2010):
+ ctx.field("StringUtils1.string3").value = ".vcxproj";
ctx.field("buildDebug.executable").value = ctx.field("devenvExecutable").value;
ctx.field("buildRelease.executable").value = ctx.field("devenvExecutable").value;
buildResults = [];
@@ -52,7 +165,11 @@
ctx.field("progress").value = 0.0;
for i in range(0, ctx.field("projectIter.numValues").value, 1):
ctx.field("projectIter.curIndex").value = i;
- projFile = ctx.field("projectIter.curValue").value; projFile = projFile.replace('.pro', '.vcproj');
+ projFile = ctx.field("projectIter.curValue").value;
+ if (vsversion == 2005):
+ projFile = projFile.replace('.pro', '.vcproj');
+ elif (vsversion == 2010):
+ projFile = projFile.replace('.pro', '.vcxproj');
basename = ctx.field("FileInformation.basename").value;
if ctx.field("projectFiles").value == "Recreate":
if MLABFileManager.exists(ctx.field("StringUtils2.result").value): #project batch file
@@ -67,6 +184,7 @@
ctx.field("callBAT.call").touch();
else:
print "Error on project " + basename + ": Could not find batch file " + ctx.field("StringUtils2.result").value;
+ noBatchFile += [basename];
elif MLABFileManager.getLastModifiedDate(ctx.field("projectIter.curValue").value) > MLABFileManager.getLastModifiedDate(projFile):
#print "pro file is newer: call bat file"
ctx.field("callBAT.call").touch();
@@ -84,7 +202,10 @@
ret = checkBuildSuccessful("Release");
buildResults += [ret];
else:
- print "Error on project " + basename + ": Could not find vcproj file " + projFile;
+ if (vsversion == 2005):
+ print "Error on project " + basename + ": Could not find vcproj file " + projFile;
+ elif (vsversion == 2010):
+ print "Error on project " + basename + ": Could not find vcxproj file " + projFile;
noProjectFile += [basename];
ctx.field("progress").value = (i+1.0)/ctx.field("projectIter.numValues").value;
#print buildResults;
@@ -114,7 +235,7 @@
print "------------------------\n";
if ctx.field("debug").value == "Build" or ctx.field("debug").value == "Rebuild" or ctx.field("release").value == "Build" or ctx.field("release").value == "Rebuild":
print "-- VCProject files ---";
- print "The following projects had no vcproj file (", len(noProjectFile), "):";
+ print "The following projects had no visual studio project file (", len(noProjectFile), "):";
if len(noProjectFile)==0:
print "<none>";
else:
@@ -168,4 +289,19 @@
print int(words[2]), "errors, ", int(words[4]), " warnings";
ret = [basename, buildtype, int(words[2]), int(words[4])];
buildlog.close();
+ return ret;
+
+def checkBuildSuccessfulXCode(buildtype):
+ path = ctx.field("FileInformation.dirname").value;
+ basename = ctx.field("FileInformation.basename").value;
+ #targetFn = path + "/build/" + buildtype + "/lib" + basename + ".dylib";
+ targetFn = path + "/build/" + "Release/lib" + basename;
+ if (buildtype == "Debug"):
+ targetFn += "_debug.dylib";
+ else:
+ targetFn += ".dylib";
+ if (MLABFileManager.exists(targetFn)):
+ ret = [basename, buildtype, 0, 0];
+ else :
+ ret = [basename, buildtype, 1, 1];
return ret;
\ No newline at end of file
Modified: trunk/Community/General/Modules/Macros/Build/BuildProjects.script
===================================================================
--- trunk/Community/General/Modules/Macros/Build/BuildProjects.script 2011-08-27 13:04:31 UTC (rev 375)
+++ trunk/Community/General/Modules/Macros/Build/BuildProjects.script 2011-09-08 18:21:30 UTC (rev 376)
@@ -35,11 +35,17 @@
Field numberOfProjects { internalName = projectIter.numValues }
Field projectList {internalName = projectIter.fieldValues }
Field devenvExecutable { type = String }
+ Field xcodeGeneratorExecutable { internalName = createXCodeProject.executable }
+ Field xcodeBuildExecutable { internalName = buildXCodeProject.executable }
Field run { type = Trigger }
+ Field runXCode { type = Trigger }
Field projectFiles { type = Enum values = "Skip, Create, Recreate"}
Field debug {type = Enum values = "Skip, Build, Rebuild, Clean"}
Field release {type = Enum values = "Skip, Build, Rebuild, Clean"}
+ Field projectFilesXCode { type = Enum values = "Skip, Create"}
+ Field debugXCode {type = Enum values = "Skip, Build"}
+ Field releaseXCode {type = Enum values = "Skip, Build"}
Field progress { type = float value = 0 }
}
@@ -59,9 +65,13 @@
FieldListener recursionDepth {
command = directoryChanged
}
- FieldListener run {
- command = runBatch
+ //FieldListener run {
+ // command = runBatch
+ //}
+ FieldListener runXCode {
+ command = runBatchXCode
}
+
}
Window {
@@ -76,16 +86,40 @@
Field recursionDepth { step = 1 dependsOn = includeSubDirectories }
}
}
- Box "Build settings" {
- Horizontal {
- Field projectFiles { }
- Field debug { }
- Field release { }
+ TabView {
+ TabViewItem "Visual Studio 2005" {
+ Horizontal {
+ Field projectFiles { }
+ Field debug { }
+ Field release { }
+ }
+ Field devenvExecutable { browseButton = Yes browseMode = open browseFilter = "\*.exe" }
+ Button run { expandX = Yes command = runBatch2005 }
+ ProgressBar progress {}
}
- Field devenvExecutable { browseButton = Yes browseMode = open browseFilter = "\*.exe" }
- Button run { expandX = Yes }
- ProgressBar progress {}
+ TabViewItem "Visual Studio 2010" {
+ Horizontal {
+ Field projectFiles { }
+ Field debug { }
+ Field release { }
+ }
+ Field devenvExecutable { browseButton = Yes browseMode = open browseFilter = "\*.exe" }
+ Button run { expandX = Yes command = runBatch2010 }
+ ProgressBar progress {}
+ }
+ TabViewItem "XCode" {
+ Horizontal {
+ Field projectFilesXCode { }
+ Field debugXCode { }
+ Field releaseXCode { }
+ }
+ Field xcodeGeneratorExecutable { browseButton = Yes browseMode = open }
+ Field xcodeBuildExecutable { browseButton = Yes browseMode = open }
+ Button runXCode { expandX = Yes title = "Run"}
+ ProgressBar progress {}
+ }
}
+
Box "Projects" {
expandY = Yes
Field numberOfProjects { edit = No}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
