Renamed to xva-img

Author: eriklax

Diff for: CHANGELOG

@@ -1,3 +1,7 @@
+v1.3
+
+- 2013-07-28 Merged with sourceforge project: Renamed to xva-img
+
 v1.2
 
 - 2013-07-28 Imported to github, fixed some compiler errors/warnings

Diff for: CMakeLists.txt

@@ -1,14 +1,14 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 
-SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -Wextra -Wno-deprecated-declarations")
+SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -Wextra")
 SET(CMAKE_BUILD_TYPE Release)
 
-PROJECT("xvatool")
-SET(TARGET_NAME "xvatool")
+PROJECT("xva-img")
+SET(TARGET_NAME "xva-img")
 FILE(GLOB_RECURSE SOURCE_FILES src/*.cpp)
 ADD_EXECUTABLE(${TARGET_NAME} ${SOURCE_FILES})
 TARGET_LINK_LIBRARIES(${TARGET_NAME}
-		crypto
+	crypto
 )
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xvatool
-		DESTINATION /usr/local/bin)
+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/xva-img
+	DESTINATION /usr/local/bin)

Diff for: INSTALL

@@ -1 +1 @@
-Run "cmake ." followed by "make install". xvatool will be installed in /usr/local/bin/
+Run "cmake ." followed by "make install". xva-img will be installed in /usr/local/bin/

Diff for: README.md

@@ -1,4 +1,4 @@
-xvatool
+xva-img
 =======
 
 Citrix Xen uses a custom virtual appliance format for import/export called "XVA". it's basically a strangely crafted tar-file. You don't need this program to unpack this tar-file, just use your favourite tar unpacker (tar, gtar, bsdtar). Once unpacked you will end up with a lot of different files, ova.xml (which contains the settings for the virtual appliance, think VMware vmx) and a number of folders called Ref:<number>/, this is your disks. Each of these folders contain hundreds of files named 00000000, 00000001 with a accompanying .CHECKSUM file (SHA1). Each file is a 1MB slice of the disk, but some of the files in the sequence will probably be missing this is because XVA do not use compression; instead it will exclude slices of the disk that only contains zeros (are empty). This tool can assemble the disk for you (you will end up with a RAW disk) that can easily be mounted and modified. It can then also split the file again and generate checksum. Once ready, you will probably want to use the "package" command to rebuild the XVA file.
@@ -13,13 +13,13 @@ Extract the XVA file.
 
 Extract one of the disks
 
-    xvatool -p disk-export my-virtual-machine/Ref\:1/ disk.raw
+    xva-img -p disk-export my-virtual-machine/Ref\:1/ disk.raw
 
 Splice the disk file (remove all files in the folder, required not to make any unnecessary mistakes)
 
     rm -rf my-virtual-machine/Ref\:1/*
-    xvatool -p disk-import my-virtual-machine/Ref\:1/ disk.raw
+    xva-img -p disk-import my-virtual-machine/Ref\:1/ disk.raw
 
 Rebuild the XVA file
 
-    xvatool -p package my-virtual-machine-fixed.xva my-virtual-machine/ova.xml my-virtual-machine/Ref\:1/
+    xva-img -p package my-virtual-machine-fixed.xva my-virtual-machine/ova.xml my-virtual-machine/Ref\:1/

Diff for: src/main.cpp

@@ -29,14 +29,14 @@
 #include "package.hpp"
 #include "disk.hpp"
 
-#define _VERSION_ "1.2"
+#define _VERSION_ "1.3"
 
 std::string program_name = "";
 
 void usage(FILE* fp, int status)
 {
 	fprintf(fp, 
-	"xentool " _VERSION_ " build on " __DATE__
+	"xva-img " _VERSION_ " build on " __DATE__
 		" (c) Erik Lax <erik@datahack.se>\n"
 	"Usage: %s [OPTION...] COMMAND ...\n"
 	"\n"