Skip to content

Commit

Permalink
Applied updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Apr 2, 2018
1 parent b209b9b commit 6518072
Show file tree
Hide file tree
Showing 25 changed files with 2,049 additions and 1,215 deletions.
7 changes: 4 additions & 3 deletions .gitignore
@@ -1,6 +1,6 @@
# Files to ignore by git
#
# Version: 20170916
# Version: 20180318

# Generic auto-generated build files
*~
Expand Down Expand Up @@ -57,12 +57,12 @@ stamp-h[1-9]
/m4/extern-inline.m4
/m4/fcntl-o.m4
/m4/gettext.m4
/m4/glibc2.m4
/m4/glibc21.m4
/m4/glibc2.m4
/m4/iconv.m4
/m4/intdiv0.m4
/m4/intl.m4
/m4/intldir.m4
/m4/intl.m4
/m4/intlmacosx.m4
/m4/intmax.m4
/m4/inttypes_h.m4
Expand Down Expand Up @@ -90,6 +90,7 @@ stamp-h[1-9]
/m4/wchar_t.m4
/m4/wint_t.m4
/m4/xsize.m4
/MANIFEST
/missing
/po/boldquot.sed
/po/en@boldquot.header
Expand Down
4 changes: 2 additions & 2 deletions COPYING
Expand Up @@ -10,7 +10,7 @@
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.

0. Additional Definitions.
0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
Expand Down Expand Up @@ -111,7 +111,7 @@ the following:
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
Version.

e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
Expand Down
2 changes: 1 addition & 1 deletion README
@@ -1,4 +1,4 @@
Library and tools to access the New Technology File System (NTFS).
libfsntfs is a library to access the New Technology File System (NTFS).

Project information:

Expand Down
18 changes: 4 additions & 14 deletions appveyor.yml
Expand Up @@ -67,9 +67,9 @@ build_script:
msbuild /verbosity:quiet vs2015\libfsntfs.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
- cmd: if [%TARGET%]==[vs2017] (
set PYTHONPATH=..\vstools &&
C:\Python27\python.exe ..\vstools\scripts\msvscpp-convert.py --extend-with-x64 --no-python-dll --output-format 2017 msvscpp\libfsntfs.sln &&
msbuild /verbosity:quiet vs2017\libfsntfs.sln /property:Platform=Win32 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
msbuild /verbosity:quiet vs2017\libfsntfs.sln /property:Platform=x64 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
C:\Python27\python.exe ..\vstools\scripts\msvscpp-convert.py --extend-with-x64 --no-python-dll --output-format 2017 --with-dokany msvscpp\libfsntfs.sln &&
msbuild /verbosity:quiet vs2017\libfsntfs.sln /property:Platform=Win32 /property:PlatformToolset=v141 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
msbuild /verbosity:quiet vs2017\libfsntfs.sln /property:Platform=x64 /property:PlatformToolset=v141 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" )
- cmd: if [%TARGET%]==[python27] (
C:\Python27\python.exe setup.py bdist_msi )
- cmd: if [%TARGET%]==[python36] (
Expand All @@ -89,17 +89,7 @@ build_script:

test_script:
- cmd: rem Run tests
- ps: if ($env:TARGET -eq "vs2008") {
.\runtests.ps1 }
- ps: if ($env:TARGET -eq "vs2010") {
.\runtests.ps1 }
- ps: if ($env:TARGET -eq "vs2012") {
.\runtests.ps1 }
- ps: if ($env:TARGET -eq "vs2013") {
.\runtests.ps1 }
- ps: if ($env:TARGET -eq "vs2015") {
.\runtests.ps1 }
- ps: if ($env:TARGET -eq "vs2017") {
- ps: If ($env:TARGET -eq "vs2008" -or $env:TARGET -eq "vs2010" -or $env:TARGET -eq "vs2012" -or $env:TARGET -eq "vs2013" -or $env:TARGET -eq "vs2015" -or $env:TARGET -eq "vs2017") {
.\runtests.ps1 }
- cmd: if [%TARGET%]==[cygwin] (
C:\cygwin\bin\bash -e -l -c "cd libfsntfs && ./runtests.sh" )
Expand Down
14 changes: 7 additions & 7 deletions configure.ac
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )

AC_INIT(
[libfsntfs],
[20180101],
[20180402],
[joachim.metz@gmail.com])

AC_CONFIG_SRCDIR(
Expand Down Expand Up @@ -48,6 +48,12 @@ AX_COMMON_CHECK_ENABLE_WINAPI
dnl Check if wide character type should be enabled
AX_COMMON_CHECK_ENABLE_WIDE_CHARACTER_TYPE

dnl Check if verbose output should be enabled
AX_COMMON_CHECK_ENABLE_VERBOSE_OUTPUT

dnl Check if debug output should be enabled
AX_COMMON_CHECK_ENABLE_DEBUG_OUTPUT

dnl Check for type definitions
AX_TYPES_CHECK_LOCAL

Expand Down Expand Up @@ -131,12 +137,6 @@ AX_LIBFUSN_CHECK_ENABLE
dnl Check if fsntfstools required headers and functions are available
AX_FSNTFSTOOLS_CHECK_LOCAL

dnl Check if libfsntfs should be build with verbose output
AX_COMMON_CHECK_ENABLE_VERBOSE_OUTPUT

dnl Check if libfsntfs should be build with debug output
AX_COMMON_CHECK_ENABLE_DEBUG_OUTPUT

dnl Check if tests required headers and functions are available
AX_TESTS_CHECK_LOCAL

Expand Down

0 comments on commit 6518072

Please sign in to comment.