JHUAPL/DistMaker
1
0
Fork 0
mirror of https://github.com/JHUAPL/DistMaker.git synced 2026-01-09 12:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moved the distMaker jar to the release directory to match the documentation.

Browse Source
This commit is contained in:
Larry Brown
2013-05-08 20:07:31 +00:00
parent 5c467a7a12
commit 25efc2f739
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
buildDistMakerBin.jardesc
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?xml version="1.0" encoding="MacRoman" standalone="no"?>
<jardesc>
<jar path="distMaker/bin/distMaker.jar"/>
<options buildIfNeeded="true" compress="true" descriptionLocation="/distMaker/buildGlumBin.jardesc" exportErrors="false" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="false" storeRefactorings="false" useSourceFolders="false"/>
<jar path="distMaker/lib/distMaker.jar"/>
<options buildIfNeeded="true" compress="true" descriptionLocation="/distMaker/buildDistMakerBin.jardesc" exportErrors="false" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
<storedRefactorings deprecationInfo="true" structuralOnly="false"/>
<selectedProjects/>
<manifest generateManifest="false" manifestLocation="/distMaker/src/Manifest.txt" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
@@ -12,7 +12,5 @@
</manifest>
<selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
<javaElement handleIdentifier="=distMaker/src"/>
<folder path="/distMaker/build/doc"/>
<folder path="/distMaker/build/classes"/>
</selectedElements>
</jardesc>

9
tools/buildRelease
View File

@@ -13,6 +13,7 @@ import time
version = '0.36'
def logAndPrint(message="", indent=0, showTime=False):
while indent > 0:
indent -= 1
@@ -29,7 +30,7 @@ def buildRelease():
installPath = os.path.dirname(installPath)
# Check for distMaker.jar library prerequisite
testPath = os.path.join(installPath, 'lib', 'distMaker.jar')
testPath = os.path.join(installPath, 'release', 'distMaker.jar')
if os.path.exists(testPath) == False:
logAndPrint('Aborting DistMaker release build. The file ' + testPath + ' does not exist.', indent=1)
logAndPrint('Please run the buildDistMakerBin.jardesc from your workspace.', indent=1)
@@ -65,9 +66,13 @@ def buildRelease():
# Copy the libraries
dstPath = os.path.join(workPath, 'lib')
os.mkdir(dstPath)
for aLib in ['glum.jar', 'guava-13.0.1.jar', 'distMaker.jar']:
for aLib in ['glum.jar', 'guava-13.0.1.jar']:
srcPath = os.path.join(installPath, 'lib', aLib)
shutil.copy2(srcPath, dstPath)
#Copy the distMaker jar
srcPath = os.path.join(installPath, 'release', 'distMaker.jar')
shutil.copy2(srcPath, dstPath)
# Copy the scripts
dstPath = os.path.join(workPath, 'script')