Thread: [Pocketgames-devel] SF.net SVN: pocketgames: [23] libraries/cab
Status: Beta
Brought to you by:
idominguez
Menu
▾
▴
pocketgames-devel
|
From: <ido...@us...> - 2007-12-29 00:51:08
|
Revision: 23
http://pocketgames.svn.sourceforge.net/pocketgames/?rev=23&view=rev
Author: idominguez
Date: 2007-12-28 16:51:09 -0800 (Fri, 28 Dec 2007)
Log Message:
-----------
STRING returns also a STRING after parsing, Pair from basic data types is used
Modified Paths:
--------------
libraries/cab/build.xml
libraries/cab/src/org/pocketgames/cab/CabHeaderParser.java
libraries/cab/src/org/pocketgames/cab/STRING.java
Added Paths:
-----------
libraries/cab/lib/pocketgames-bdt.jar
Modified: libraries/cab/build.xml
===================================================================
--- libraries/cab/build.xml 2007-12-29 00:03:52 UTC (rev 22)
+++ libraries/cab/build.xml 2007-12-29 00:51:09 UTC (rev 23)
@@ -5,7 +5,7 @@
</description>
<property name="library" value="org.*" />
-<property name="deps" value="" />
+<property name="deps" value="lib/pocketgames-bdt.jar" />
<taskdef resource="checkstyletask.properties">
<classpath>
Added: libraries/cab/lib/pocketgames-bdt.jar
===================================================================
--- libraries/cab/lib/pocketgames-bdt.jar (rev 0)
+++ libraries/cab/lib/pocketgames-bdt.jar 2007-12-29 00:51:09 UTC (rev 23)
@@ -0,0 +1,33 @@
+PK
+ |
|
From: <ido...@us...> - 2007-12-31 18:57:02
|
Revision: 58
http://pocketgames.svn.sourceforge.net/pocketgames/?rev=58&view=rev
Author: idominguez
Date: 2007-12-31 10:57:07 -0800 (Mon, 31 Dec 2007)
Log Message:
-----------
New script to parse the file (automatically generated after compile)
Modified Paths:
--------------
libraries/cab/build.xml
Added Paths:
-----------
libraries/cab/build/cabheader.xml
Added: libraries/cab/build/cabheader.xml
===================================================================
--- libraries/cab/build/cabheader.xml (rev 0)
+++ libraries/cab/build/cabheader.xml 2007-12-31 18:57:07 UTC (rev 58)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="script" basedir=".">
+<description>
+</description>
+
+<macrodef name="genscript">
+<attribute name="dirname" />
+<attribute name="script" default="bin/cabheader.sh" />
+<sequential>
+<echo file="@{dirname}/@{script}" append="false" >#!/bin/sh
+CLASSDIR="@{dirname}/lib"
+POCKETGAMES_CAB="$$CLASSDIR/pocketpc-theme-lib.jar"
+POCKETGAMES_BDT="$$CLASSDIR/pocketgames-bdt.jar"
+
+CLASSPATH="$$CLASSPATH:$$POCKETGAMES_CAB:$$POCKETGAMES_BDT"
+
+java -cp "$$CLASSPATH" org.pocketgames.cab.CabHeaderReader $*
+</echo>
+<chmod file="@{script}" perm="u+x"/>
+</sequential>
+</macrodef>
+
+</project>
+
Modified: libraries/cab/build.xml
===================================================================
--- libraries/cab/build.xml 2007-12-31 18:56:57 UTC (rev 57)
+++ libraries/cab/build.xml 2007-12-31 18:57:07 UTC (rev 58)
@@ -4,9 +4,15 @@
PocketPC themes library
</description>
+<basename file="." property="curdir" />
+<dirname file="." property="parentdir" />
+<property name="completedir" value="${parentdir}/${curdir}" />
+
<property name="library" value="org.*" />
<property name="deps" value="lib/pocketgames-bdt.jar" />
+<import file="build/cabheader.xml" />
+
<taskdef resource="checkstyletask.properties">
<classpath>
<fileset dir="lib/" includes="*.jar" />
@@ -42,11 +48,15 @@
closure="yes" />
<javac srcdir="src" destdir="obj" deprecation="on" classpath="${deps}"/>
<jar jarfile="lib/${ant.project.name}.jar" basedir="obj" update="true" />
+ <genscript dirname="${parentdir}/${curdir}" />
</target>
<target name="clean" >
<delete dir="obj/org" />
<delete file="lib/${ant.project.name}.jar" />
+ <delete>
+ <fileset dir="bin" includes="*" excludes=".keep" />
+ </delete>
<delete includeemptydirs="true" >
<fileset dir="doc" includes="**/*" excludes=".keep" />
</delete>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ido...@us...> - 2007-12-31 18:57:19
|
Revision: 59
http://pocketgames.svn.sourceforge.net/pocketgames/?rev=59&view=rev
Author: idominguez
Date: 2007-12-31 10:57:20 -0800 (Mon, 31 Dec 2007)
Log Message:
-----------
two new headers and the instructions to use them
Added Paths:
-----------
libraries/cab/doc/
libraries/cab/doc/examples/
libraries/cab/doc/examples/MYTH~BKQ.000
libraries/cab/doc/examples/README
libraries/cab/doc/examples/tkcreate.000
Added: libraries/cab/doc/examples/MYTH~BKQ.000
===================================================================
--- libraries/cab/doc/examples/MYTH~BKQ.000 (rev 0)
+++ libraries/cab/doc/examples/MYTH~BKQ.000 2007-12-31 18:57:20 UTC (rev 59)
@@ -0,0 +1,8 @@
+MSCE |
|
From: <ido...@us...> - 2008-03-07 23:57:50
|
Revision: 229
http://pocketgames.svn.sourceforge.net/pocketgames/?rev=229&view=rev
Author: idominguez
Date: 2008-03-07 15:57:55 -0800 (Fri, 07 Mar 2008)
Log Message:
-----------
Specific example added to README file
Modified Paths:
--------------
libraries/cab/doc/examples/README
libraries/cab/src/org/pocketgames/cab/installdata/CabInstallDataReader.java
libraries/cab/src/org/pocketgames/cab/installdata/Word.java
libraries/cab/src/org/pocketgames/cab/installdata/backend/CabInstallDataPrinter.java
libraries/cab/src/org/pocketgames/cab/installdata/frontend/CabInstallDataParser.java
Modified: libraries/cab/doc/examples/README
===================================================================
--- libraries/cab/doc/examples/README 2008-01-12 12:59:15 UTC (rev 228)
+++ libraries/cab/doc/examples/README 2008-03-07 23:57:55 UTC (rev 229)
@@ -1,3 +1,3 @@
To parse cab header files, use the script in bin/:
-./bin/cabheader.sh < doc/examples/sample1.000
+./bin/cabheader.sh < doc/examples/tkcreate.000
Modified: libraries/cab/src/org/pocketgames/cab/installdata/CabInstallDataReader.java
===================================================================
--- libraries/cab/src/org/pocketgames/cab/installdata/CabInstallDataReader.java 2008-01-12 12:59:15 UTC (rev 228)
+++ libraries/cab/src/org/pocketgames/cab/installdata/CabInstallDataReader.java 2008-03-07 23:57:55 UTC (rev 229)
@@ -1,12 +1,17 @@
package org.pocketgames.cab.installdata;
+import org.pocketgames.cab.installdata.backend.CabInstallDataPrinter;
import org.pocketgames.cab.installdata.frontend.CabInstallDataParser;
+import org.pocketgames.cab.installdata.data.CabInstallData;
public class CabInstallDataReader
{
public static void main (String args[]) throws Exception
{
CabInstallDataParser parser = new CabInstallDataParser();
- parser.parseCabInstallDataFile (System.in);
+ CabInstallData data = parser.parseCabInstallDataFile (System.in);
+ CabInstallDataPrinter printer = new CabInstallDataPrinter();
+ byte[] bytes = printer.getBytes(data);
+ System.out.write(bytes);
}
}
Modified: libraries/cab/src/org/pocketgames/cab/installdata/Word.java
===================================================================
--- libraries/cab/src/org/pocketgames/cab/installdata/Word.java 2008-01-12 12:59:15 UTC (rev 228)
+++ libraries/cab/src/org/pocketgames/cab/installdata/Word.java 2008-03-07 23:57:55 UTC (rev 229)
@@ -48,7 +48,7 @@
public static byte[] toWord32 (int i)
{
- byte[] ret = new byte[2];
+ byte[] ret = new byte[4];
ret[0] = (byte)(i & 0xFF);
ret[1] = (byte)((i >>> 8) & 0xFF);
ret[2] = (byte)((i >>> 16) & 0xFF);
Modified: libraries/cab/src/org/pocketgames/cab/installdata/backend/CabInstallDataPrinter.java
===================================================================
--- libraries/cab/src/org/pocketgames/cab/installdata/backend/CabInstallDataPrinter.java 2008-01-12 12:59:15 UTC (rev 228)
+++ libraries/cab/src/org/pocketgames/cab/installdata/backend/CabInstallDataPrinter.java 2008-03-07 23:57:55 UTC (rev 229)
@@ -38,6 +38,7 @@
int numberOfRegHives = this.head.reghives.size();
byte[] regkeys = this.getRegKeysBytes();
int numberOfRegKeys = this.head.regkeys.size();
+ System.err.println (numberOfRegKeys);
byte[] links = this.getLinksBytes();
int numberOfLinks = this.head.links.size();
int offsetStrings = 100;
@@ -71,12 +72,12 @@
this.setUnknownBytes();
this.setArchitecture();
this.setCompatibility();
- this.copyToMain (toWord32(total_length), 8);
+ this.copyToMain (toWord32(this.head.totalLength), 8);
this.copyToMain (toWord16(numberOfStrings), 48);
this.copyToMain (toWord16(numberOfDirs), 50);
this.copyToMain (toWord16(numberOfFiles), 52);
this.copyToMain (toWord16(numberOfRegHives), 54);
- this.copyToMain (toWord16(0), 56); // Number of regkeys
+ this.copyToMain (toWord16(numberOfRegKeys), 56); // Number of regkeys
this.copyToMain (toWord16(numberOfLinks), 58);
this.copyToMain (toWord32(offsetStrings), 60);
this.copyToMain (toWord32(offsetDirs), 64);
@@ -121,12 +122,12 @@
private void setCompatibility ()
{
- this.copyToMain (toWord32 (this.head.minimalVersion.getMinor()), 24);
- this.copyToMain (toWord32 (this.head.minimalVersion.getMajor()), 28);
- this.copyToMain (toWord32 (this.head.maximalVersion.getMinor()), 32);
- this.copyToMain (toWord32 (this.head.maximalVersion.getMajor()), 36);
- this.copyToMain (toWord32 (this.head.minimalBuildNumber), 40);
- this.copyToMain (toWord32 (this.head.maximalBuildNumber), 44);
+ this.copyToMain (toWord32 (this.head.minimalVersion.getMajor()), 24);
+ this.copyToMain (toWord32 (this.head.minimalVersion.getMinor()), 28);
+ this.copyToMain (toWord32 (this.head.maximalVersion.getMajor()), 32);
+ this.copyToMain (toWord32 (this.head.maximalVersion.getMinor()), 36);
+ this.copyToMain (toWord32 (this.head.maximalBuildNumber), 40);
+ this.copyToMain (toWord32 (this.head.minimalBuildNumber), 44);
}
private byte[] getAppName ()
Modified: libraries/cab/src/org/pocketgames/cab/installdata/frontend/CabInstallDataParser.java
===================================================================
--- libraries/cab/src/org/pocketgames/cab/installdata/frontend/CabInstallDataParser.java 2008-01-12 12:59:15 UTC (rev 228)
+++ libraries/cab/src/org/pocketgames/cab/installdata/frontend/CabInstallDataParser.java 2008-03-07 23:57:55 UTC (rev 229)
@@ -74,7 +74,7 @@
dirs,
files,
regHives,
- new HashSet<REGKEY>(),
+ regKeys,
links,
appname,
provider,
@@ -233,6 +233,7 @@
Pair<Integer,REGKEY> res = ParserREGKEY.parseRegKey (content, offsetRK);
offsetRK = res.getLeft();
this.regKeys.add (res.getRight());
+ System.err.println("One regkey added");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
