Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated Heimdall (command line) autotools files for the 1.3.1 changes.

Heimdall 1.3.1 should now build on Linux and OS X.
  • Loading branch information...
commit fbbed42c1e5719cc7a4dceeba098981f19f37c06 1 parent 0de82e0
Benjamin Dobell authored
54 README
View
@@ -1,27 +1,27 @@
---------------------------------------------------------------------------------
-Heimdall (c) 2010-2011 Benjamin Dobell, Glass Echidna
-http://www.glassechidna.com.au/products/heimdall/
-
-DISCLAIMER:
-
- This software attempts to flash your Galaxy S device. The very nature of
- flashing is dangerous. As with all flashing software, Heimdall has the
- potential to damage (brick) your phone if not used carefully. If you're
- concerned, don't use this software. Flashing ROMs onto your phone may also
- void your warranty. Benjamin Dobell and Glass Echidna are not responsible
- for the result of your actions.
-
---------------------------------------------------------------------------------
-
-For more details about how to compile and install Heimdall please refer to the
-appropriate platform specific README:
-
-- Linux:
- Linux/README
-
-- OS X
- OSX/README.txt
-
-- Windows
- Win32/README.txt
-
+--------------------------------------------------------------------------------
+Heimdall (c) 2010-2011 Benjamin Dobell, Glass Echidna
+http://www.glassechidna.com.au/products/heimdall/
+
+DISCLAIMER:
+
+ This software attempts to flash your Galaxy S device. The very nature of
+ flashing is dangerous. As with all flashing software, Heimdall has the
+ potential to damage (brick) your phone if not used carefully. If you're
+ concerned, don't use this software. Flashing ROMs onto your phone may also
+ void your warranty. Benjamin Dobell and Glass Echidna are not responsible
+ for the result of your actions.
+
+--------------------------------------------------------------------------------
+
+For more details about how to compile and install Heimdall please refer to the
+appropriate platform specific README:
+
+- Linux:
+ Linux/README
+
+- OS X
+ OSX/README.txt
+
+- Windows
+ Win32/README.txt
+
67 heimdall/Makefile.am
View
@@ -1,33 +1,34 @@
-AUTOMAKE_OPTIONS = subdir-objects
-ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
-AM_CPPFLAGS = $(DEPS_CFLAGS) -I../libpit/Source
-STATIC_LIBS = ../libpit/libpit-1.3.a
-
-bin_PROGRAMS = heimdall
-heimdall_SOURCES = source/BeginDumpPacket.h source/BridgeManager.cpp \
- source/BridgeManager.h source/ControlPacket.h source/DeviceInfoPacket.h \
- source/DeviceInfoResponse.h source/DumpPartFileTransferPacket.h \
- source/DumpPartPitFilePacket.h source/DumpResponse.h source/EndFileTransferPacket.h \
- source/EndModemFileTransferPacket.h source/EndPhoneFileTransferPacket.h \
- source/EndSessionPacket.h source/FileTransferPacket.h source/FlashPartFileTransferPacket.h \
- source/FlashPartPitFilePacket.h source/Heimdall.h source/InboundPacket.h \
- source/Interface.cpp source/Interface.h source/main.cpp source/OutboundPacket.h \
- source/Packet.h source/PitFilePacket.h source/PitFileResponse.h source/ReceiveFilePartPacket.h \
- source/ResponsePacket.h source/SendFilePartPacket.h source/SendFilePartResponse.h
-
-heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)
-
-if LINUXTARGET
-udevrulesdir = /lib/udev/rules.d
-udevrules_DATA = 60-heimdall-galaxy-s.rules
-
-install-data-hook:
-if UDEVADM
- sudo udevadm control --reload_rules
-else
- sudo service udev restart
-endif
-
-endif
-
-dist_noinst_SCRIPTS = autogen.sh
+AUTOMAKE_OPTIONS = subdir-objects
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+AM_CPPFLAGS = $(DEPS_CFLAGS) -I../libpit/Source
+STATIC_LIBS = ../libpit/libpit-1.3.a
+
+bin_PROGRAMS = heimdall
+heimdall_SOURCES = source/BeginDumpPacket.h source/BridgeManager.cpp \
+ source/BridgeManager.h source/DumpPartPitFilePacket.h source/DumpResponse.h \
+ source/EndFileTransferPacket.h source/EndModemFileTransferPacket.h \
+ source/EndPitFileTransferPacket.h source/EndPhoneFileTransferPacket.h \
+ source/EndSessionPacket.h source/FileTransferPacket.h source/FlashPartFileTransferPacket.h \
+ source/FlashPartPitFilePacket.h source/Heimdall.h source/InboundPacket.h \
+ source/Interface.cpp source/Interface.h source/main.cpp source/OutboundPacket.h \
+ source/Packet.h source/PitFilePacket.h source/PitFileResponse.h source/ReceiveFilePartPacket.h \
+ source/ResponsePacket.h source/SendFilePartPacket.h source/SendFilePartResponse.h \
+ source/ControlPacket.h source/SessionSetupPacket.h source/SessionSetupResponse.h \
+ source/DumpPartFileTransferPacket.h
+
+heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)
+
+if LINUXTARGET
+udevrulesdir = /lib/udev/rules.d
+udevrules_DATA = 60-heimdall-galaxy-s.rules
+
+install-data-hook:
+if UDEVADM
+ sudo udevadm control --reload_rules
+else
+ sudo service udev restart
+endif
+
+endif
+
+dist_noinst_SCRIPTS = autogen.sh
11 heimdall/Makefile.in
View
@@ -253,15 +253,16 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
AM_CPPFLAGS = $(DEPS_CFLAGS) -I../libpit/Source
STATIC_LIBS = ../libpit/libpit-1.3.a
heimdall_SOURCES = source/BeginDumpPacket.h source/BridgeManager.cpp \
- source/BridgeManager.h source/ControlPacket.h source/DeviceInfoPacket.h \
- source/DeviceInfoResponse.h source/DumpPartFileTransferPacket.h \
- source/DumpPartPitFilePacket.h source/DumpResponse.h source/EndFileTransferPacket.h \
- source/EndModemFileTransferPacket.h source/EndPhoneFileTransferPacket.h \
+ source/BridgeManager.h source/DumpPartPitFilePacket.h source/DumpResponse.h \
+ source/EndFileTransferPacket.h source/EndModemFileTransferPacket.h \
+ source/EndPitFileTransferPacket.h source/EndPhoneFileTransferPacket.h \
source/EndSessionPacket.h source/FileTransferPacket.h source/FlashPartFileTransferPacket.h \
source/FlashPartPitFilePacket.h source/Heimdall.h source/InboundPacket.h \
source/Interface.cpp source/Interface.h source/main.cpp source/OutboundPacket.h \
source/Packet.h source/PitFilePacket.h source/PitFileResponse.h source/ReceiveFilePartPacket.h \
- source/ResponsePacket.h source/SendFilePartPacket.h source/SendFilePartResponse.h
+ source/ResponsePacket.h source/SendFilePartPacket.h source/SendFilePartResponse.h \
+ source/ControlPacket.h source/SessionSetupPacket.h source/SessionSetupResponse.h \
+ source/DumpPartFileTransferPacket.h
heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)
@LINUXTARGET_TRUE@udevrulesdir = /lib/udev/rules.d
1  heimdall/autogen.sh
View
@@ -1,2 +1,3 @@
#!/bin/sh
autoreconf --force --install
+
92 heimdall/autom4te.cache/output.0
View
@@ -2376,8 +2376,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
+
+
@@ -2585,7 +2585,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-fi
+fi
# Extract the first word of "udevadm", so it can be a program name with args.
set dummy udevadm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -2622,7 +2622,7 @@ else
$as_echo "no" >&6; }
fi
-
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2761,7 +2761,7 @@ case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, &&
- program_prefix=${target_alias}-
+ program_prefix=${target_alias}-
am__api_version='1.11'
# Find a good install program. We prefer a C program (faster),
@@ -3230,10 +3230,10 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
+
+
ac_config_headers="$ac_config_headers config.h"
-
+
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3929,7 +3929,7 @@ else
am__fastdepCXX_FALSE=
fi
-
+
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -14526,10 +14526,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Only expand once:
-
+
ac_config_files="$ac_config_files Makefile"
-
-
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -14552,47 +14552,47 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
-
-
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking operating system" >&5
-$as_echo_n "checking operating system... " >&6; }
-case $target in
-*-linux*)
+$as_echo_n "checking operating system... " >&6; }
+case $target in
+*-linux*)
$as_echo "@%:@define OS_LINUX /**/" >>confdefs.h
-
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5
-$as_echo "Linux" >&6; }
- linuxtarget=true
- ;;
-*-darwin*)
+$as_echo "Linux" >&6; }
+ linuxtarget=true
+ ;;
+*-darwin*)
$as_echo "@%:@define OS_DARWIN /**/" >>confdefs.h
-
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin/MacOS X" >&5
-$as_echo "Darwin/MacOS X" >&6; }
- linuxtarget=false
- ;;
-*-mingw*)
+$as_echo "Darwin/MacOS X" >&6; }
+ linuxtarget=false
+ ;;
+*-mingw*)
$as_echo "@%:@define OS_WINDOWS /**/" >>confdefs.h
-
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows" >&5
-$as_echo "Windows" >&6; }
- linuxtarget=false
- ;;
-*-cygwin*)
+$as_echo "Windows" >&6; }
+ linuxtarget=false
+ ;;
+*-cygwin*)
$as_echo "@%:@define OS_WINDOWS /**/" >>confdefs.h
-
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows" >&5
-$as_echo "Windows" >&6; }
- linuxtarget=false
- ;;
-*)
- as_fn_error $? "unsupported operating system" "$LINENO" 5
-esac
-
+$as_echo "Windows" >&6; }
+ linuxtarget=false
+ ;;
+*)
+ as_fn_error $? "unsupported operating system" "$LINENO" 5
+esac
+
if test x$linuxtarget = xtrue; then
LINUXTARGET_TRUE=
LINUXTARGET_FALSE='#'
@@ -14600,7 +14600,7 @@ else
LINUXTARGET_TRUE='#'
LINUXTARGET_FALSE=
fi
-
+
if test x$udevadmninstalled = xtrue; then
UDEVADM_TRUE=
UDEVADM_FALSE='#'
@@ -14608,8 +14608,8 @@ else
UDEVADM_TRUE='#'
UDEVADM_FALSE=
fi
-
-
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then :
@@ -14833,8 +14833,8 @@ $as_echo "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
as_fn_error $? "unknown endianness
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
-
-
+
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -17455,4 +17455,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-
+
92 heimdall/autom4te.cache/output.1
View
@@ -2376,8 +2376,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
+
+
@@ -2585,7 +2585,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-fi
+fi
# Extract the first word of "udevadm", so it can be a program name with args.
set dummy udevadm; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -2622,7 +2622,7 @@ else
$as_echo "no" >&6; }
fi
-
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2761,7 +2761,7 @@ case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
test -n "$target_alias" &&
test "$program_prefix$program_suffix$program_transform_name" = \
NONENONEs,x,x, &&
- program_prefix=${target_alias}-
+ program_prefix=${target_alias}-
am__api_version='1.11'
# Find a good install program. We prefer a C program (faster),
@@ -3230,10 +3230,10 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
+
+
ac_config_headers="$ac_config_headers config.h"
-
+
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3929,7 +3929,7 @@ else
am__fastdepCXX_FALSE=
fi
-
+
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -14522,10 +14522,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Only expand once:
-
+
ac_config_files="$ac_config_files Makefile"
-
-
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -14548,47 +14548,47 @@ fi
MAINT=$MAINTAINER_MODE_TRUE
-
-
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking operating system" >&5
-$as_echo_n "checking operating system... " >&6; }
-case $target in
-*-linux*)
+$as_echo_n "checking operating system... " >&6; }
+case $target in
+*-linux*)
$as_echo "@%:@define OS_LINUX /**/" >>confdefs.h
-
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5
-$as_echo "Linux" >&6; }
- linuxtarget=true
- ;;
-*-darwin*)
+$as_echo "Linux" >&6; }
+ linuxtarget=true
+ ;;
+*-darwin*)
$as_echo "@%:@define OS_DARWIN /**/" >>confdefs.h
-
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin/MacOS X" >&5
-$as_echo "Darwin/MacOS X" >&6; }
- linuxtarget=false
- ;;
-*-mingw*)
+$as_echo "Darwin/MacOS X" >&6; }
+ linuxtarget=false
+ ;;
+*-mingw*)
$as_echo "@%:@define OS_WINDOWS /**/" >>confdefs.h
-
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows" >&5
-$as_echo "Windows" >&6; }
- linuxtarget=false
- ;;
-*-cygwin*)
+$as_echo "Windows" >&6; }
+ linuxtarget=false
+ ;;
+*-cygwin*)
$as_echo "@%:@define OS_WINDOWS /**/" >>confdefs.h
-
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows" >&5
-$as_echo "Windows" >&6; }
- linuxtarget=false
- ;;
-*)
- as_fn_error $? "unsupported operating system" "$LINENO" 5
-esac
-
+$as_echo "Windows" >&6; }
+ linuxtarget=false
+ ;;
+*)
+ as_fn_error $? "unsupported operating system" "$LINENO" 5
+esac
+
if test x$linuxtarget = xtrue; then
LINUXTARGET_TRUE=
LINUXTARGET_FALSE='#'
@@ -14596,7 +14596,7 @@ else
LINUXTARGET_TRUE='#'
LINUXTARGET_FALSE=
fi
-
+
if test x$udevadmninstalled = xtrue; then
UDEVADM_TRUE=
UDEVADM_FALSE='#'
@@ -14604,8 +14604,8 @@ else
UDEVADM_TRUE='#'
UDEVADM_FALSE=
fi
-
-
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
if test "${ac_cv_c_bigendian+set}" = set; then :
@@ -14829,8 +14829,8 @@ $as_echo "@%:@define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
as_fn_error $? "unknown endianness
presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
-
-
+
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -17451,4 +17451,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-
+
0  heimdall/config.guess 100644 → 100755
View
File mode changed
0  heimdall/config.sub 100644 → 100755
View
File mode changed
92 heimdall/configure.ac
View
@@ -1,46 +1,46 @@
-AC_INIT([Heimdall], [1.3], [bug-report@glassechidna.com.au], [heimdall], [http://www.glassechidna.com.au/])
-AC_PREREQ([2.59])
-PKG_CHECK_MODULES([DEPS], [libusb-1.0 >= 1.0.8])
-AC_PROGRAM_CHECK(udevadminstalled, udevadm)
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AC_CONFIG_FILES([Makefile])
-
-AM_MAINTAINER_MODE
-
-AC_MSG_CHECKING([operating system])
-case $target in
-*-linux*)
- AC_DEFINE(OS_LINUX, [], [Linux backend])
- AC_MSG_RESULT([Linux])
- linuxtarget=true
- ;;
-*-darwin*)
- AC_DEFINE(OS_DARWIN, [], [Darwin backend])
- AC_MSG_RESULT([Darwin/MacOS X])
- linuxtarget=false
- ;;
-*-mingw*)
- AC_DEFINE(OS_WINDOWS, [], [Windows backend])
- AC_MSG_RESULT([Windows])
- linuxtarget=false
- ;;
-*-cygwin*)
- AC_DEFINE(OS_WINDOWS, [], [Windows backend])
- AC_MSG_RESULT([Windows])
- linuxtarget=false
- ;;
-*)
- AC_MSG_ERROR([unsupported operating system])
-esac
-
-AM_CONDITIONAL([LINUXTARGET], [test x$linuxtarget = xtrue])
-AM_CONDITIONAL([UDEVADM], [test x$udevadmninstalled = xtrue])
-
-AC_C_BIGENDIAN
-
-AC_OUTPUT
+AC_INIT([Heimdall], [1.3], [bug-report@glassechidna.com.au], [heimdall], [http://www.glassechidna.com.au/])
+AC_PREREQ([2.59])
+PKG_CHECK_MODULES([DEPS], [libusb-1.0 >= 1.0.8])
+AC_PROGRAM_CHECK(udevadminstalled, udevadm)
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+AC_CONFIG_FILES([Makefile])
+
+AM_MAINTAINER_MODE
+
+AC_MSG_CHECKING([operating system])
+case $target in
+*-linux*)
+ AC_DEFINE(OS_LINUX, [], [Linux backend])
+ AC_MSG_RESULT([Linux])
+ linuxtarget=true
+ ;;
+*-darwin*)
+ AC_DEFINE(OS_DARWIN, [], [Darwin backend])
+ AC_MSG_RESULT([Darwin/MacOS X])
+ linuxtarget=false
+ ;;
+*-mingw*)
+ AC_DEFINE(OS_WINDOWS, [], [Windows backend])
+ AC_MSG_RESULT([Windows])
+ linuxtarget=false
+ ;;
+*-cygwin*)
+ AC_DEFINE(OS_WINDOWS, [], [Windows backend])
+ AC_MSG_RESULT([Windows])
+ linuxtarget=false
+ ;;
+*)
+ AC_MSG_ERROR([unsupported operating system])
+esac
+
+AM_CONDITIONAL([LINUXTARGET], [test x$linuxtarget = xtrue])
+AM_CONDITIONAL([UDEVADM], [test x$udevadmninstalled = xtrue])
+
+AC_C_BIGENDIAN
+
+AC_OUTPUT
0  heimdall/depcomp 100644 → 100755
View
File mode changed
0  heimdall/missing 100644 → 100755
View
File mode changed
Please sign in to comment.
Something went wrong with that request. Please try again.