diff --git a/build/build-testacant.xml b/build/build-testacant.xml index ae9e730..f89bca6 100644 --- a/build/build-testacant.xml +++ b/build/build-testacant.xml @@ -82,7 +82,7 @@ - + diff --git a/src/com/webcodepro/applecommander/ui/AntTask.java b/src/com/webcodepro/applecommander/ui/AntTask.java index d26a6c4..f5504d7 100644 --- a/src/com/webcodepro/applecommander/ui/AntTask.java +++ b/src/com/webcodepro/applecommander/ui/AntTask.java @@ -45,7 +45,7 @@ public class AntTask extends Task * dos140: * pro140/pro800: * pas140/pas800: - * convert: + * convert: [] */ if (_command.equals("i")) { @@ -226,7 +226,7 @@ public class AntTask extends Task { try { - com.webcodepro.applecommander.ui.ac.convert(_fileName, _imageName); + com.webcodepro.applecommander.ui.ac.convert(_fileName, _imageName, Integer.parseInt(_sizeBlocks)); } catch (IOException io) { @@ -282,6 +282,11 @@ public class AntTask extends Task _address = address; } + public void setSizeBlocks(String sizeBlocks) + { + _sizeBlocks = sizeBlocks; + } + public void setFailOnError(String failonerror) { if (failonerror.equalsIgnoreCase("true")) @@ -307,4 +312,6 @@ public class AntTask extends Task String _type = null; String _address = "0x2000"; + + String _sizeBlocks = "0"; } diff --git a/src/com/webcodepro/applecommander/ui/ac.java b/src/com/webcodepro/applecommander/ui/ac.java index e7b78be..115c453 100644 --- a/src/com/webcodepro/applecommander/ui/ac.java +++ b/src/com/webcodepro/applecommander/ui/ac.java @@ -534,7 +534,7 @@ public class ac { * * DiskCopy 4.2 image - convert it to a ProDOS image * SDK disk image - unpack it to a disk image - * ShrinkIt file bundle [future] - unpack files onto a disk image sized to fit + * ShrinkIt file bundle - unpack files onto a disk image sized to fit */ static void convert(String shrinkName, String imageName) throws IOException { @@ -546,7 +546,7 @@ public class ac { * * DiskCopy 4.2 image - convert it to a ProDOS image * SDK disk image - unpack it to a disk image - * ShrinkIt file bundle - unpack files onto a disk image sized to fit + * ShrinkIt file bundle - unpack files onto a disk image sized to fit, or as specified in numbers of blocks */ static void convert(String shrinkName, String imageName, int imageSize) throws IOException {