Bug 130 incorrect manifest

freemansoft · Jun 10, 2018 · 93cdadf · 93cdadf
1 parent 7c2d0e4
commit 93cdadf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/jacob/build.xml b/jacob/build.xml
@@ -51,14 +51,15 @@
 			Now build up all the derived properties
 		 ================================================================== -->
 
-	<property name="application.title" 			value="JACOB : Java COM Bridge" />
-	<property name="application.vendor" 		value="http://jacob-project.sourceforge.net" />
-	<property name="src.java.mainpackage" 		value="com.jacob" />
-	<property name="generated.filename.dll.x86" value="jacob-${version}-x86.dll" />
-	<property name="generated.filename.dll.x64" value="jacob-${version}-x64.dll" />
-	<property name="generated.filename.jar" 	value="jacob.jar" />
-	<property name="generated.filename.zip" 	value="jacob-${version}" />
-	<property name="generated.filename.version"	value="JacobVersion.properties" />
+	<property name="application.title"              value="JACOB : Java COM Bridge" />
+	<property name="application.vendor"             value="http://jacob-project.sourceforge.net" />
+	<property name="src.java.mainpackage"           value="com.jacob" />
+	<property name="src.java.mainpackage.manifest" 	value="com/jacob/" />
+	<property name="generated.filename.dll.x86"     value="jacob-${version}-x86.dll" />
+	<property name="generated.filename.dll.x64"     value="jacob-${version}-x64.dll" />
+	<property name="generated.filename.jar"         value="jacob.jar" />
+	<property name="generated.filename.zip"         value="jacob-${version}" />
+	<property name="generated.filename.version"     value="JacobVersion.properties" />
 
 	<property name="junit.jar"         value="${basedir}/lib/junit-4.12.jar" />
 	<property name="hamcrest-core.jar" value="${basedir}/lib/hamcrest-core-1.3.jar" />
@@ -254,8 +255,8 @@
 				unless="jarUpToDate">
 		<echo>Removing old jars</echo>
 		<delete file="${release.file.jar}" />
-		<echo>Packaging java classes...</echo>		
-		<echo>Version File is ${release.dir.java.meta.inf}/${generated.filename.version}</echo>		
+		<echo>Packaging java classes from ${release.dir.java} ...</echo>		
+		<echo>Generated Version File is ${release.dir.java.meta.inf}/${generated.filename.version}</echo>		
 		<jar destfile="${release.file.jar}" basedir="${release.dir.java}" update="false">
 			<exclude name="**/CVS" />
 			<!-- exclude all unit tests (ending in Test) 
@@ -267,7 +268,7 @@
 			<include name="META-INF/${generated.filename.version}" />
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<section name="${src.java.mainpackage}">
+				<section name="${src.java.mainpackage.manifest}">
 					<attribute name="Specification-Title" value="${application.title}" />
 					<attribute name="Specification-Vendor" value="${application.vendor}" />
 					<attribute name="Implementation-Title" value="${application.title} Java libraries" />
@@ -456,7 +457,6 @@
 		</zip>
 		<zip
 			destfile="${release.dir}/${generated.filename.zip}_src.zip">
-			<exclude name="**/CVS" />
 			<exclude name="**/*.obj" />
 			<exclude name="**/*.class" />
 			<exclude name="**/*.dll" />

diff --git a/jacob/docs/ReleaseNotes.html b/jacob/docs/ReleaseNotes.html
@@ -21,8 +21,12 @@ <h3>Tracked Changes</h3>
       <td colspan="2"><b>Bugs</b></td>
     </tr> 
     <tr> 
-      <td width="13%" valign="top">n/a</td>
-      <td width="87%" valign="top">none</td>
+      <td width="13%" valign="top">132</td>
+      <td width="87%" valign="top"><a href="https://sourceforge.net/p/jacob-project/bugs/132/">32 bit ponters not convertd to 64 bit</a></td>
+    </tr>
+    <tr>
+      <td width="13%" valign="top">130</td>
+      <td width="87%" valign="top"><a href="https://sourceforge.net/p/jacob-project/bugs/130/">Name value incorrect in Mainfest.MF affecting tamper check</a></td>
     </tr>
     <tr>
       <td colspan="2"><b>Patches</b></td>