diff --git a/.gitattributes b/.gitattributes index 224d7139..e227a7f8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,6 +3,8 @@ *.am eol=lf *.in eol=lf *.m4 eol=lf +missing eol=lf +compile eol=lf configure eol=lf install-sh eol=lf *.sln eol=crlf @@ -12,7 +14,9 @@ install-sh eol=lf *.txt eol=crlf *.loc eol=crlf *.sh export-ignore +*.cmd export-ignore .gitattributes export-ignore .gitignore export-ignore +.github export-ignore *.creole export-ignore diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..12301490 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 00000000..78f390bc --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,47 @@ + + +Checklist +--------- +- [ ] I looked at https://github.com/pbatard/rufus/wiki/FAQ to see if my question has already been answered. +- [ ] I performed a search in the issue tracker for similar issues using keywords relevant to my problem, such as the error message I got from the log. +- [ ] I clicked the 'Log' button (🗒️) or pressed Ctrl-L in Rufus, or used [DebugView](https://learn.microsoft.com/en-us/sysinternals/downloads/debugview), and copy/pasted the log into the section that says `` below. +- [ ] The log I am copying is the FULL log, starting with the line `Rufus version: x.y.z` - I have NOT removed any part of it. + +Additionally (if applicable): +- [ ] I ran a bad blocks check, by clicking _Show advanced format options_ then _Check device for bad blocks_, and confirmed that my USB is not defective. +- [ ] I also tried one or more of the following: + - [ ] Using a different USB drive. + - [ ] Plugging the USB into a different port. + - [ ] Running Rufus on a different computer. +- [ ] If using an image, I clicked on the `(✓)` button to compute the MD5, SHA1 and SHA256 checksums, which are therefore present in the log I copied. I confirmed, by performing an internet search, that these values match the ones from the official image. + +Issue description +----------------- + + +Log +--- +``` + +``` diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..1e0f4014 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 00000000..040896d5 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,59 @@ +name: "CodeQL" + +on: + push: + branches: [master] + paths-ignore: + - '.gitignore' + - '.gitattributes' + - 'res/**' + - '**.cmd' + - '**.md' + - '**.rc' + - '**.sh' + - '**.txt' + - '**.xml' + pull_request: + branches: [master] + paths-ignore: + - '.gitignore' + - '.gitattributes' + - 'res/**' + - '**.cmd' + - '**.md' + - '**.rc' + - '**.sh' + - '**.txt' + - '**.xml' + +env: + SOLUTION_FILE_PATH: ./rufus.sln + BUILD_CONFIGURATION: Release + TARGET_PLATFORM: x64 + +jobs: + CodeQL-Build: + runs-on: windows-latest + + permissions: + security-events: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: cpp + + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v2 + with: + msbuild-architecture: x64 + + - name: Build + run: msbuild ${{env.SOLUTION_FILE_PATH}} /m /p:Configuration=${{ env.BUILD_CONFIGURATION}},Platform=${{ env.TARGET_PLATFORM }} + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml new file mode 100644 index 00000000..98bcca8d --- /dev/null +++ b/.github/workflows/coverity.yml @@ -0,0 +1,64 @@ +name: Coverity + +on: + push: + branches: [master] + paths-ignore: + - '.gitignore' + - '.gitattributes' + - 'res/**' + - '**.cmd' + - '**.md' + - '**.rc' + - '**.sh' + - '**.txt' + - '**.xml' + +env: + SOLUTION_FILE_PATH: ./rufus.sln + EMAIL: pete@akeo.ie + BUILD_CONFIGURATION: Release + TARGET_PLATFORM: x64 + COVERITY_PROJECT_NAME: pbatard%2Frufus + +jobs: + Coverity-Build: + runs-on: windows-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: recursive + + - name: Download Coverity + run: | + curl -d "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=${{ env.COVERITY_PROJECT_NAME }}" -L https://scan.coverity.com/download/cxx/win64 -o cov-analysis-win64.zip + 7z x cov-analysis-win64.zip + del cov-analysis-win64.zip + move cov-analysis-win64* cov-analysis-win64 + + - name: Add Coverity to PATH + shell: bash + run: echo "${{github.workspace}}/cov-analysis-win64/bin" >> $GITHUB_PATH + + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v2 + + - name: Build with Coverity + run: | + cov-configure --msvc + cov-build.exe --dir cov-int msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ env.TARGET_PLATFORM }} + + - name: Publish Coverity artifacts + uses: actions/upload-artifact@v4 + with: + name: cov-int + path: cov-int/ + + - name: Upload Coverity build for analysis + run: | + 7z a -r cov-int.zip cov-int + curl --form email=${{ env.EMAIL }} --form token=${{ secrets.COVERITY_SCAN_TOKEN }} --form file=@cov-int.zip --form version="${{ env.GITHUB_SHA }}" --form description="Automated build" https://scan.coverity.com/builds?project=${{ env.COVERITY_PROJECT_NAME }} + diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml new file mode 100644 index 00000000..9f85edcf --- /dev/null +++ b/.github/workflows/lock.yml @@ -0,0 +1,19 @@ +# Configuration for https://github.com/dessant/lock-threads +name: '[cron] Lock stale issues' + +on: + schedule: + - cron: '33 22 * * *' + +jobs: + lock: + runs-on: ubuntu-latest + steps: + - uses: dessant/lock-threads@v5 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + issue-inactive-days: '90' + issue-comment: > + This thread has been automatically locked since there has not been + any recent activity after it was closed. Please open a new issue + if you think you have a related problem or query. diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml new file mode 100644 index 00000000..c56eacc6 --- /dev/null +++ b/.github/workflows/mingw.yml @@ -0,0 +1,113 @@ +name: MinGW + +on: + push: + paths-ignore: + - '.gitignore' + - '.gitattributes' + - 'res/**' + - '**.cmd' + - '**.md' + - '**.rc' + - '**.sh' + - '**.txt' + - '**.xml' + pull_request: + branches: [master] + paths-ignore: + - '.gitignore' + - '.gitattributes' + - 'res/**' + - '**.cmd' + - '**.md' + - '**.rc' + - '**.sh' + - '**.txt' + - '**.xml' + +jobs: + MinGW-Build: + runs-on: windows-latest + + strategy: + matrix: + include: + - { sys: mingw64, env: x86_64, exe: rufus.exe } + - { sys: mingw32, env: i686, exe: rufus_x86.exe } + + defaults: + run: + shell: msys2 {0} + + steps: + - name: Install MinGW + uses: msys2/setup-msys2@v2 + with: + msystem: ${{ matrix.sys }} + update: true + install: >- + mingw-w64-${{ matrix.env }}-toolchain + base-devel + autotools + git + upx + + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: recursive + + - name: Set ALPHA + id: set_alpha + shell: bash + if: ${{ !startsWith(github.ref, 'refs/tags/') }} + # This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT + run: | + echo "option=--enable-alpha" >> $GITHUB_OUTPUT + sed -b -i 's/VALUE "InternalName", "Rufus"/VALUE "InternalName", "Rufus (ALPHA)"/' ./src/rufus.rc + + - name: Set BETA + id: set_beta + shell: bash + if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'BETA') }} + # This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT + run: | + echo "option=--enable-beta" >> $GITHUB_OUTPUT + sed -b -i 's/VALUE "InternalName", "Rufus"/VALUE "InternalName", "Rufus (BETA)"/' ./src/rufus.rc + + - name: Build + run: | + ./configure --disable-debug ${{ steps.set_alpha.outputs.option }} ${{ steps.set_beta.outputs.option }} + make -j4 + mv ./src/rufus.exe ./${{ matrix.exe }} + strip ./${{ matrix.exe }} + upx --lzma --best ./${{ matrix.exe }} + + - name: Display SHA-256 + run: sha256sum ./${{ matrix.exe }} + + - name: Upload to VirusTotal + if: ${{ github.event_name == 'push' && matrix.env == 'x86_64' }} + continue-on-error: true + run: | + curl --request POST --url https://www.virustotal.com/vtapi/v2/file/scan --form apikey=${{ secrets.VIRUSTOTAL_API_KEY }} --form file=@./${{ matrix.exe }} + curl --request POST --url https://www.virustotal.com/api/v3/monitor/items --header 'x-apikey: ${{ secrets.VIRUSTOTAL_API_KEY }}' --form path='/${{ matrix.exe }}' --form file=@./${{ matrix.exe }} + + - name: Upload artifacts + if: ${{ github.event_name == 'push' }} + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.sys }} + path: ./*.exe + + Extra-Step-To-Merge-Artifacts-Thanks-To-Upload-Artifact-v4-Breaking-Backwards-Compatibility: + runs-on: windows-latest + needs: MinGW-Build + steps: + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 + if: ${{ github.event_name == 'push' }} + with: + name: MinGW + delete-merged: true \ No newline at end of file diff --git a/.github/workflows/vs2022.yml b/.github/workflows/vs2022.yml new file mode 100644 index 00000000..249f7ad4 --- /dev/null +++ b/.github/workflows/vs2022.yml @@ -0,0 +1,106 @@ +name: VS2022 + +on: + push: + paths-ignore: + - '.gitignore' + - '.gitattributes' + - 'res/**' + - '**.cmd' + - '**.md' + - '**.rc' + - '**.sh' + - '**.txt' + - '**.xml' + pull_request: + branches: [master] + paths-ignore: + - '.gitignore' + - '.gitattributes' + - 'res/**' + - '**.cmd' + - '**.md' + - '**.rc' + - '**.sh' + - '**.txt' + - '**.xml' + +env: + SOLUTION_FILE_PATH: ./rufus.sln + BUILD_CONFIGURATION: Release + +jobs: + VS2022-Build: + runs-on: windows-latest + + strategy: + matrix: + TARGET_PLATFORM: [x64, x86, arm64, arm] + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: recursive + + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v2 + with: + msbuild-architecture: x64 + + - name: Set ALPHA + id: set_alpha + shell: bash + if: ${{ !startsWith(github.ref, 'refs/tags/') }} + # This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT + run: | + echo "option=/DALPHA" >> $GITHUB_OUTPUT + sed -b -i 's/VALUE "InternalName", "Rufus"/VALUE "InternalName", "Rufus (ALPHA)"/' ./src/rufus.rc + + - name: Set BETA + id: set_beta + shell: bash + if: ${{ startsWith(github.ref, 'refs/tags/') && contains(github.ref, 'BETA') }} + # This ONLY works if the shell is bash or if using $env:GITHUB_OUTPUT + run: | + echo "option=/DBETA" >> $GITHUB_OUTPUT + sed -b -i 's/VALUE "InternalName", "Rufus"/VALUE "InternalName", "Rufus (BETA)"/' ./src/rufus.rc + + - name: Build + shell: cmd + run: | + set ExternalCompilerOptions=${{ steps.set_alpha.outputs.option }} ${{ steps.set_beta.outputs.option }} + msbuild ${{ env.SOLUTION_FILE_PATH }} /m /p:Configuration=${{ env.BUILD_CONFIGURATION }},Platform=${{ matrix.TARGET_PLATFORM }},ForceImportBeforeCppTargets=%GITHUB_WORKSPACE%\.vs\Generate.PDB.props + move .\${{ matrix.TARGET_PLATFORM }}\Release\rufus.exe .\rufus_${{ matrix.TARGET_PLATFORM }}.exe + move .\${{ matrix.TARGET_PLATFORM }}\Release\rufus.pdb .\rufus_${{ matrix.TARGET_PLATFORM }}.pdb + + - name: Display SHA-256 + run: sha256sum ./rufus_${{ matrix.TARGET_PLATFORM }}.exe + + - name: Upload to VirusTotal + continue-on-error: true + if: ${{ github.event_name == 'push' }} + run: | + curl --request POST --url https://www.virustotal.com/vtapi/v2/file/scan --form apikey=${{ secrets.VIRUSTOTAL_API_KEY }} --form file=@./rufus_${{ matrix.TARGET_PLATFORM }}.exe + curl --request POST --url https://www.virustotal.com/api/v3/monitor/items --header 'x-apikey: ${{ secrets.VIRUSTOTAL_API_KEY }}' --form path='/rufus_${{ matrix.TARGET_PLATFORM }}.exe' --form file=@./rufus_${{ matrix.TARGET_PLATFORM }}.exe + + - name: Upload artifacts + uses: actions/upload-artifact@v4 + if: ${{ github.event_name == 'push' }} + with: + name: ${{ matrix.TARGET_PLATFORM }} + path: | + ./*.exe + ./*.pdb + + Extra-Step-To-Merge-Artifacts-Thanks-To-Upload-Artifact-v4-Breaking-Backwards-Compatibility: + runs-on: windows-latest + needs: VS2022-Build + steps: + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 + if: ${{ github.event_name == 'push' }} + with: + name: VS2022 + delete-merged: true diff --git a/.gitignore b/.gitignore index ecdb1e5d..b1585858 100644 --- a/.gitignore +++ b/.gitignore @@ -1,34 +1,68 @@ +*.a *.aps +*.appx +*.appxupload +*.bak +*.db +*.db-shm +*.db-wal *.dep +*.diff +*.dll +*.efi *.exe *.htm *.idb +*.ipch *.la *.lib *.lo +*.lock *.log *.mac +*.mo +*.mp4 *.ncb +*.nope *.o *.obj +*.old +*.opendb *.opt +*.org +*.p7x +*.patch *.pc *.pdb +*.pdf *.plg *.res +*.sig +*.sdf *.suo *.swp +*.tlog *.user +*.opensdf +*.o_manifest .deps .libs -x86_32 -x86_64 +Makefile +/arm +/arm64 +/x64 +/x86 autom4te.cache -compile config.guess -./config.h +/config.h config.log config.status config.sub depcomp +embedded.loc +/res/loc/pollock/.vs +/res/loc/pollock/bin +/res/loc/pollock/obj +/rufus_files stamp-h1 +/.vs/rufus diff --git a/.mingw/Makefile.am b/.mingw/Makefile.am new file mode 100644 index 00000000..ec826d27 --- /dev/null +++ b/.mingw/Makefile.am @@ -0,0 +1,31 @@ +# Create delay-loaded libraries from a DLL, that aren't vulnerable to side-loading +AM_V_DLLTOOL_0 = @echo " LIB $@";$(DLLTOOL) +AM_V_DLLTOOL_1 = $(DLLTOOL) +AM_V_DLLTOOL_ = $(AM_V_DLLTOOL_$(AM_DEFAULT_VERBOSITY)) +AM_V_DLLTOOL = $(AM_V_DLLTOOL_$(V)) + +AM_V_SED_0 = @echo " SED $<";$(SED) +AM_V_SED_1 = $(SED) +AM_V_SED_ = $(AM_V_SED_$(AM_DEFAULT_VERBOSITY)) +AM_V_SED = $(AM_V_SED_$(V)) + +# Ah the joys of Windows DLL calling conventions, that require an @## suffix in the .def +# for x86_32 and but no @## for x86_64, thereby forcing us to strip stuff according to the +# target arch. Oh, and we can't use 'target_cpu' or AC definitions on account that we are +# switching archs when building on our local machine, and don't want to have to go though +# a costly reconf each time when we can simply issue a 'make clean'. +TUPLE := $(shell $(CC) -dumpmachine) +TARGET := $(word 1,$(subst -, ,$(TUPLE))) +DEF_SUFFIX := $(if $(TARGET:x86_64=),.def,.def64) + +.PHONY: all +all: dwmapi-delaylib.lib version-delaylib.lib virtdisk-delaylib.lib wininet-delaylib.lib wintrust-delaylib.lib + +%.def64: %.def + $(AM_V_SED) "s/@.*//" $< >$@ + +%-delaylib.lib: %$(DEF_SUFFIX) + $(AM_V_DLLTOOL) --input-def $< --output-delaylib $@ --dllname $(basename $<).dll + +clean: + $(RM) -rf *.lib diff --git a/.mingw/Makefile.in b/.mingw/Makefile.in new file mode 100644 index 00000000..117eb9c4 --- /dev/null +++ b/.mingw/Makefile.in @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = .mingw +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +depcomp = +am__depfiles_maybe = +SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_LDFLAGS = @AM_LDFLAGS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DLLTOOL = @DLLTOOL@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EXEEXT = @EXEEXT@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +RM = @RM@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +SUFFIX = @SUFFIX@ +VERSION = @VERSION@ +VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ +WINDRES = @WINDRES@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# Create delay-loaded libraries from a DLL, that aren't vulnerable to side-loading +AM_V_DLLTOOL_0 = @echo " LIB $@";$(DLLTOOL) +AM_V_DLLTOOL_1 = $(DLLTOOL) +AM_V_DLLTOOL_ = $(AM_V_DLLTOOL_$(AM_DEFAULT_VERBOSITY)) +AM_V_DLLTOOL = $(AM_V_DLLTOOL_$(V)) +AM_V_SED_0 = @echo " SED $<";$(SED) +AM_V_SED_1 = $(SED) +AM_V_SED_ = $(AM_V_SED_$(AM_DEFAULT_VERBOSITY)) +AM_V_SED = $(AM_V_SED_$(V)) + +# Ah the joys of Windows DLL calling conventions, that require an @## suffix in the .def +# for x86_32 and but no @## for x86_64, thereby forcing us to strip stuff according to the +# target arch. Oh, and we can't use 'target_cpu' or AC definitions on account that we are +# switching archs when building on our local machine, and don't want to have to go though +# a costly reconf each time when we can simply issue a 'make clean'. +TUPLE := $(shell $(CC) -dumpmachine) +TARGET := $(word 1,$(subst -, ,$(TUPLE))) +DEF_SUFFIX := $(if $(TARGET:x86_64=),.def,.def64) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps .mingw/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign --ignore-deps .mingw/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic dvi dvi-am html html-am \ + info info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \ + uninstall uninstall-am + + +.PHONY: all +all: dwmapi-delaylib.lib version-delaylib.lib virtdisk-delaylib.lib wininet-delaylib.lib wintrust-delaylib.lib + +%.def64: %.def + $(AM_V_SED) "s/@.*//" $< >$@ + +%-delaylib.lib: %$(DEF_SUFFIX) + $(AM_V_DLLTOOL) --input-def $< --output-delaylib $@ --dllname $(basename $<).dll + +clean: + $(RM) -rf *.lib + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/.mingw/dwmapi.def b/.mingw/dwmapi.def new file mode 100644 index 00000000..240e17c7 --- /dev/null +++ b/.mingw/dwmapi.def @@ -0,0 +1,2 @@ +EXPORTS + DwmGetWindowAttribute@16 diff --git a/.mingw/version.def b/.mingw/version.def new file mode 100644 index 00000000..3ee9c727 --- /dev/null +++ b/.mingw/version.def @@ -0,0 +1,4 @@ +EXPORTS + GetFileVersionInfoSizeW@8 + GetFileVersionInfoW@16 + VerQueryValueA@16 diff --git a/.mingw/virtdisk.def b/.mingw/virtdisk.def new file mode 100644 index 00000000..7fafde83 --- /dev/null +++ b/.mingw/virtdisk.def @@ -0,0 +1,8 @@ +EXPORTS + AttachVirtualDisk@24 + CreateVirtualDisk@36 + DetachVirtualDisk@12 + GetVirtualDiskInformation@16 + GetVirtualDiskPhysicalPath@12 + GetVirtualDiskOperationProgress@12 + OpenVirtualDisk@24 diff --git a/.mingw/wininet.def b/.mingw/wininet.def new file mode 100644 index 00000000..c1ca40d0 --- /dev/null +++ b/.mingw/wininet.def @@ -0,0 +1,12 @@ +EXPORTS + HttpQueryInfoA@20 + HttpOpenRequestA@32 + HttpSendRequestA@20 + InternetCloseHandle@4 + InternetConnectA@32 + InternetCrackUrlA@16 + InternetGetConnectedState@8 + InternetGetLastResponseInfoA@12 + InternetOpenA@20 + InternetReadFile@16 + InternetSetOptionA@16 diff --git a/.mingw/wintrust.def b/.mingw/wintrust.def new file mode 100644 index 00000000..f69580ce --- /dev/null +++ b/.mingw/wintrust.def @@ -0,0 +1,2 @@ +EXPORTS + WinVerifyTrustEx@12 diff --git a/.vs/Generate.PDB.props b/.vs/Generate.PDB.props new file mode 100644 index 00000000..61e016b8 --- /dev/null +++ b/.vs/Generate.PDB.props @@ -0,0 +1,8 @@ + + + + + DebugFull + + + diff --git a/.vs/bled.vcxproj b/.vs/bled.vcxproj new file mode 100644 index 00000000..94e9e48e --- /dev/null +++ b/.vs/bled.vcxproj @@ -0,0 +1,316 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bled + {FB6D52D4-A2F8-C358-DB85-BBCAECFDDD7D} + bled + 10.0 + + + + StaticLibrary + Unicode + v143 + + + StaticLibrary + Unicode + v143 + true + + + StaticLibrary + Unicode + v143 + true + + + StaticLibrary + Unicode + v143 + + + StaticLibrary + Unicode + v143 + true + + + StaticLibrary + Unicode + v143 + true + true + + + StaticLibrary + Unicode + v143 + true + true + + + StaticLibrary + Unicode + v143 + true + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + Level3 + ProgramDatabase + Disabled + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + ..\src + CompileAsC + /utf-8 %(AdditionalOptions) + + + true + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + ProgramDatabase + Disabled + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + ..\src + /utf-8 %(AdditionalOptions) + + + true + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + ProgramDatabase + Disabled + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + ..\src + /utf-8 %(AdditionalOptions) + + + true + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + ProgramDatabase + EnableFastChecks + Disabled + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + ..\src + CompileAsC + /utf-8 %(AdditionalOptions) + + + true + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + MultiThreaded + ..\src + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + true + + + + + Level3 + true + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + MultiThreaded + ..\src + /utf-8 %(AdditionalOptions) + true + + + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + true + + + + + Level3 + true + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + MultiThreaded + ..\src + /utf-8 %(AdditionalOptions) + true + + + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + true + + + + + Level3 + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + MultiThreaded + ..\src + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + .\7z.def + + + true + + + + \ No newline at end of file diff --git a/.vs/bled.vcxproj.filters b/.vs/bled.vcxproj.filters new file mode 100644 index 00000000..f7370b6b --- /dev/null +++ b/.vs/bled.vcxproj.filters @@ -0,0 +1,120 @@ + + + + + {396df203-84ec-49b8-ae11-074c50a020f0} + + + {0147b833-dc8f-4666-be99-77dfae5e6679} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/.vs/ext2fs.vcxproj b/.vs/ext2fs.vcxproj new file mode 100644 index 00000000..521437b2 --- /dev/null +++ b/.vs/ext2fs.vcxproj @@ -0,0 +1,355 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ext2fs + {B01F5886-2B39-4B66-B65C-6427135B6A02} + ext2fs + 10.0 + + + + StaticLibrary + Unicode + v143 + + + StaticLibrary + Unicode + v143 + true + + + StaticLibrary + Unicode + v143 + true + + + StaticLibrary + Unicode + v143 + + + StaticLibrary + Unicode + v143 + true + + + StaticLibrary + Unicode + v143 + true + true + + + StaticLibrary + Unicode + v143 + true + true + + + StaticLibrary + Unicode + v143 + true + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + Level3 + ProgramDatabase + Disabled + _CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + ..\src;..\src\msvc-missing + CompileAsC + 4018;4146;4244;4267;4996 + /utf-8 %(AdditionalOptions) + + + true + true + true + $(OutDir)$(TargetName)$(TargetExt) + + + + + Level3 + ProgramDatabase + Disabled + _CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + ..\src;..\src\msvc-missing + 4018;4146;4244;4267;4996 + /utf-8 %(AdditionalOptions) + + + true + true + true + $(OutDir)$(TargetName)$(TargetExt) + + + + + Level3 + ProgramDatabase + Disabled + _CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + ..\src;..\src\msvc-missing + 4018;4146;4244;4267;4996 + /utf-8 %(AdditionalOptions) + + + true + true + true + $(OutDir)$(TargetName)$(TargetExt) + + + + + Level3 + ProgramDatabase + EnableFastChecks + Disabled + _CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + ..\src;..\src\msvc-missing + CompileAsC + 4018;4146;4244;4267;4996 + /utf-8 %(AdditionalOptions) + + + true + true + true + $(OutDir)$(TargetName)$(TargetExt) + + + + + Level3 + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + ..\src;..\src\msvc-missing + CompileAsC + 4018;4146;4244;4267;4996 + /utf-8 %(AdditionalOptions) + true + + + true + true + $(OutDir)$(TargetName)$(TargetExt) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + true + + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + ..\src;..\src\msvc-missing + 4018;4146;4244;4267;4996 + /utf-8 %(AdditionalOptions) + true + + + true + true + $(OutDir)$(TargetName)$(TargetExt) + + + true + + + + + Level3 + true + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + ..\src;..\src\msvc-missing + 4018;4146;4244;4267;4996 + /utf-8 %(AdditionalOptions) + true + + + true + true + $(OutDir)$(TargetName)$(TargetExt) + + + true + + + + + Level3 + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + ..\src;..\src\msvc-missing + CompileAsC + 4018;4146;4244;4267;4996 + /utf-8 %(AdditionalOptions) + true + + + true + true + $(OutDir)$(TargetName)$(TargetExt) + + + true + + + + \ No newline at end of file diff --git a/.vs/ext2fs.vcxproj.filters b/.vs/ext2fs.vcxproj.filters new file mode 100644 index 00000000..3175862a --- /dev/null +++ b/.vs/ext2fs.vcxproj.filters @@ -0,0 +1,237 @@ + + + + + {396df203-84ec-49b8-ae11-074c50a020f0} + + + {0147b833-dc8f-4666-be99-77dfae5e6679} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/.vs/getopt.vcxproj b/.vs/getopt.vcxproj new file mode 100644 index 00000000..767adf07 --- /dev/null +++ b/.vs/getopt.vcxproj @@ -0,0 +1,252 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {AE83E1B4-CE06-47EE-B7A3-C3A1D7C2D71E} + getopt + 10.0 + + + + StaticLibrary + Unicode + true + v143 + + + StaticLibrary + Unicode + true + v143 + true + + + StaticLibrary + Unicode + true + v143 + true + + + StaticLibrary + Unicode + v143 + true + + + StaticLibrary + Unicode + v143 + true + true + + + StaticLibrary + Unicode + v143 + true + true + + + StaticLibrary + Unicode + true + v143 + + + StaticLibrary + Unicode + v143 + true + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + HAVE_STRING_H;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + 28252;28253 + Disabled + CompileAsC + /utf-8 %(AdditionalOptions) + + + true + + + + + HAVE_STRING_H;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + 28252;28253 + /utf-8 %(AdditionalOptions) + + + true + + + + + HAVE_STRING_H;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + 28252;28253 + /utf-8 %(AdditionalOptions) + + + true + + + + + X64 + + + HAVE_STRING_H;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + 28252;28253 + Disabled + CompileAsC + /utf-8 %(AdditionalOptions) + + + true + + + + + MaxSpeed + HAVE_STRING_H;%(PreprocessorDefinitions) + MultiThreaded + Level3 + 28252;28253 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + true + + + + + MaxSpeed + HAVE_STRING_H;%(PreprocessorDefinitions) + MultiThreaded + Level3 + 28252;28253 + /utf-8 %(AdditionalOptions) + true + + + true + + + + + MaxSpeed + HAVE_STRING_H;%(PreprocessorDefinitions) + MultiThreaded + Level3 + 28252;28253 + /utf-8 %(AdditionalOptions) + true + + + true + + + + + X64 + + + HAVE_STRING_H;%(PreprocessorDefinitions) + MultiThreaded + Level3 + 28252;28253 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/getopt/.msvc/getopt.vcxproj.filters b/.vs/getopt.vcxproj.filters similarity index 82% rename from src/getopt/.msvc/getopt.vcxproj.filters rename to .vs/getopt.vcxproj.filters index 2e23d852..42735f9e 100644 --- a/src/getopt/.msvc/getopt.vcxproj.filters +++ b/.vs/getopt.vcxproj.filters @@ -11,15 +11,15 @@ - + Source Files - + Source Files - + Header Files diff --git a/.vs/libcdio-driver.vcxproj b/.vs/libcdio-driver.vcxproj new file mode 100644 index 00000000..1e8b35c7 --- /dev/null +++ b/.vs/libcdio-driver.vcxproj @@ -0,0 +1,300 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {FA1B1093-BA86-410A-B7A0-7A54C605F812} + Win32Proj + driver + libcdio-driver + 10.0 + + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX86 + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + Level3 + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + MachineX86 + + + + + Level3 + + + MaxSpeed + true + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + + + MaxSpeed + true + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX64 + + + + + Level3 + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + Windows + true + true + true + + + MachineX64 + + + + + + \ No newline at end of file diff --git a/src/libcdio/driver/.msvc/driver.vcxproj.filters b/.vs/libcdio-driver.vcxproj.filters similarity index 52% rename from src/libcdio/driver/.msvc/driver.vcxproj.filters rename to .vs/libcdio-driver.vcxproj.filters index c66ff677..1825f9cd 100644 --- a/src/libcdio/driver/.msvc/driver.vcxproj.filters +++ b/.vs/libcdio-driver.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -11,78 +11,84 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + + Source Files + + Source Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + + Header Files + + Header Files diff --git a/.vs/libcdio-iso9660.vcxproj b/.vs/libcdio-iso9660.vcxproj new file mode 100644 index 00000000..beadf8e6 --- /dev/null +++ b/.vs/libcdio-iso9660.vcxproj @@ -0,0 +1,293 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + {D4E80F35-2604-40AC-B436-97B052ECB572} + Win32Proj + iso9660 + libcdio-iso9660 + 10.0 + + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX86 + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + Level3 + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + MachineX86 + + + + + Level3 + + + MaxSpeed + true + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + + + MaxSpeed + true + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX64 + + + + + Level3 + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + Windows + true + true + true + + + MachineX64 + + + + + + \ No newline at end of file diff --git a/src/libcdio/iso9660/.msvc/iso9660.vcxproj.filters b/.vs/libcdio-iso9660.vcxproj.filters similarity index 52% rename from src/libcdio/iso9660/.msvc/iso9660.vcxproj.filters rename to .vs/libcdio-iso9660.vcxproj.filters index 0da863f6..d62e4879 100644 --- a/src/libcdio/iso9660/.msvc/iso9660.vcxproj.filters +++ b/.vs/libcdio-iso9660.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -11,54 +11,63 @@ - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + + Header Files + + + Header Files + + + Header Files + + Header Files - + Source Files - + Source Files - + Source Files - + Source Files diff --git a/.vs/libcdio-udf.vcxproj b/.vs/libcdio-udf.vcxproj new file mode 100644 index 00000000..60ce04b7 --- /dev/null +++ b/.vs/libcdio-udf.vcxproj @@ -0,0 +1,286 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + {0CEC40A6-A195-4BE5-A88B-0AB00EB142EC} + Win32Proj + udf + libcdio-udf + 10.0 + + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX86 + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + Level3 + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + MachineX86 + + + + + Level3 + + + MaxSpeed + true + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + + + MaxSpeed + true + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + Disabled + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX64 + + + + + Level3 + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + Windows + true + true + true + + + MachineX64 + + + + + + \ No newline at end of file diff --git a/src/libcdio/udf/.msvc/udf.vcxproj.filters b/.vs/libcdio-udf.vcxproj.filters similarity index 64% rename from src/libcdio/udf/.msvc/udf.vcxproj.filters rename to .vs/libcdio-udf.vcxproj.filters index 617205d6..432966ce 100644 --- a/src/libcdio/udf/.msvc/udf.vcxproj.filters +++ b/.vs/libcdio-udf.vcxproj.filters @@ -11,42 +11,42 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/.vs/ms-sys.vcxproj b/.vs/ms-sys.vcxproj new file mode 100644 index 00000000..1679bf4f --- /dev/null +++ b/.vs/ms-sys.vcxproj @@ -0,0 +1,337 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2B1D078D-8EB4-4398-9CA4-23457265A7F6} + Win32Proj + mssys + 10.0 + + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + Level3 + Disabled + _CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 28252;28253 + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX86 + + + + + + + Level3 + Disabled + _CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /analyze:stacksize32850 /utf-8 %(AdditionalOptions) + 28252;28253 + + + Windows + true + + + + + + + + Level3 + Disabled + _CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + /analyze:stacksize32850 /utf-8 %(AdditionalOptions) + 28252;28253 + + + Windows + true + + + + + + Level3 + %(PreprocessorDefinitions) + ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 28252;28253 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + MachineX86 + + + + + Level3 + + + MaxSpeed + true + %(PreprocessorDefinitions) + ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /analyze:stacksize32850 /utf-8 %(AdditionalOptions) + 28252;28253 + true + + + + + + Level3 + + + MaxSpeed + true + %(PreprocessorDefinitions) + ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + /analyze:stacksize32850 /utf-8 %(AdditionalOptions) + 28252;28253 + true + + + + + + Level3 + Disabled + _CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 28252;28253 + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX64 + + + + + Level3 + %(PreprocessorDefinitions) + ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 28252;28253 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + Windows + true + true + true + + + MachineX64 + + + + + + \ No newline at end of file diff --git a/.vs/ms-sys.vcxproj.filters b/.vs/ms-sys.vcxproj.filters new file mode 100644 index 00000000..d8dc4d00 --- /dev/null +++ b/.vs/ms-sys.vcxproj.filters @@ -0,0 +1,185 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/.vs/rufus.vcxproj b/.vs/rufus.vcxproj new file mode 100644 index 00000000..8c9b40f9 --- /dev/null +++ b/.vs/rufus.vcxproj @@ -0,0 +1,492 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + rufus + {731858A7-0303-4988-877B-9C0DD6471864} + rufus + Win32Proj + 10.0 + + + + Application + Unicode + true + v143 + + + Application + Unicode + true + v143 + true + + + Application + Unicode + true + v143 + true + + + Application + Unicode + v143 + true + + + Application + Unicode + v143 + true + true + + + Application + Unicode + v143 + true + true + + + Application + Unicode + true + v143 + + + Application + Unicode + v143 + true + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + + + + + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;%(AdditionalIncludeDirectories) + CompileAsC + true + Async + 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) + Disabled + /utf-8 $(ExternalCompilerOptions) %(AdditionalOptions) + + + advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;shlwapi.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;%(AdditionalDependencies) + RequireAdministrator + true + Windows + MachineX86 + advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;%(DelayLoadDLLs) + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc + Generating 'embedded.loc' file + + + + + + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;%(AdditionalIncludeDirectories) + CompileAsC + true + Async + 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) + /utf-8 $(ExternalCompilerOptions) %(AdditionalOptions) + + + advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;shlwapi.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) + RequireAdministrator + true + Windows + C:\Program Files (x86)\Windows Kits\10\Lib\10.0.15063.0\um\arm + advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;ole32.dll;advapi32.dll;gdi32.dll;shell32.dll;comdlg32.dll;%(DelayLoadDLLs) + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + + + type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc + Generating 'embedded.loc' file + + + + + + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;%(AdditionalIncludeDirectories) + CompileAsC + true + Async + 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) + /utf-8 $(ExternalCompilerOptions) %(AdditionalOptions) + + + advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;shlwapi.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) + RequireAdministrator + true + Windows + C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\arm64 + advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;ole32.dll;advapi32.dll;gdi32.dll;shell32.dll;comdlg32.dll;%(DelayLoadDLLs) + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + + + type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc + Generating 'embedded.loc' file + + + + + + X64 + + + ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;%(AdditionalIncludeDirectories) + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + true + Async + 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) + Disabled + /utf-8 $(ExternalCompilerOptions) %(AdditionalOptions) + + + advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;shlwapi.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;%(AdditionalDependencies) + RequireAdministrator + true + Windows + MachineX64 + advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;%(DelayLoadDLLs) + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc + Generating 'embedded.loc' file + + + + + + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;%(AdditionalIncludeDirectories) + CompileAsC + true + Async + 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) + NDEBUG + /utf-8 $(ExternalCompilerOptions) %(AdditionalOptions) + true + + + advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;shlwapi.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;%(AdditionalDependencies) + RequireAdministrator + false + Windows + MachineX86 + /BREPRO %(AdditionalOptions) + advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;%(DelayLoadDLLs) + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc + Generating 'embedded.loc' file + + + + + + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;%(AdditionalIncludeDirectories) + CompileAsC + true + Async + 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) + NDEBUG + /utf-8 $(ExternalCompilerOptions) %(AdditionalOptions) + true + + + advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;shlwapi.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) + RequireAdministrator + false + Windows + C:\Program Files (x86)\Windows Kits\10\Lib\10.0.15063.0\um\arm + /BREPRO %(AdditionalOptions) + advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;ole32.dll;advapi32.dll;gdi32.dll;shell32.dll;comdlg32.dll;%(DelayLoadDLLs) + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + + + type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc + Generating 'embedded.loc' file + + + + + + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;%(AdditionalIncludeDirectories) + CompileAsC + true + Async + 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) + NDEBUG + /utf-8 $(ExternalCompilerOptions) %(AdditionalOptions) + true + + + advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;shlwapi.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) + RequireAdministrator + false + Windows + C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\arm64 + /BREPRO %(AdditionalOptions) + advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;ole32.dll;advapi32.dll;gdi32.dll;shell32.dll;comdlg32.dll;%(DelayLoadDLLs) + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + + + type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc + Generating 'embedded.loc' file + + + + + + X64 + + + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;COBJMACROS;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ..\src;..\src\msvc-missing;..\src\ms-sys\inc;..\src\syslinux\libinstaller;..\src\syslinux\libfat;..\src\syslinux\win;..\src\libcdio;..\src\getopt;%(AdditionalIncludeDirectories) + CompileAsC + true + Async + 4091;5255;28251;28252;28253;%(DisableSpecificWarnings) + NDEBUG + /utf-8 $(ExternalCompilerOptions) %(AdditionalOptions) + true + + + advapi32.lib;comctl32.lib;crypt32.lib;gdi32.lib;ole32.lib;dwmapi.lib;setupapi.lib;shell32.lib;shlwapi.lib;version.lib;virtdisk.lib;wininet.lib;wintrust.lib;%(AdditionalDependencies) + RequireAdministrator + false + Windows + MachineX64 + /BREPRO %(AdditionalOptions) + advapi32.dll;comctl32.dll;crypt32.dll;gdi32.dll;ole32.dll;dwmapi.dll;setupapi.dll;shell32.dll;shlwapi.dll;version.dll;virtdisk.dll;wininet.dll;wintrust.dll;%(DelayLoadDLLs) + + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + + + type $(SolutionDir)res\loc\rufus.loc | findstr /v MSG_9 > $(SolutionDir)res\loc\embedded.loc + Generating 'embedded.loc' file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {fb6d52d4-a2f8-c358-db85-bbcaecfddd7d} + + + {ae83e1b4-ce06-47ee-b7a3-c3a1d7c2d71e} + + + {fa1b1093-ba86-410a-b7a0-7a54c605f812} + + + {d4e80f35-2604-40ac-b436-97b052ecb572} + + + {0cec40a6-a195-4be5-a88b-0ab00eb142ec} + + + {2b1d078d-8eb4-4398-9ca4-23457265a7f6} + + + {8390dce0-859d-4f57-ad9c-aaeac4d77eef} + + + {266502ac-cd74-4581-b707-938a7d05ad7a} + + + {7d2e9784-ddf7-4988-a887-cf099bc3b340} + + + {b01f5886-2b39-4b66-b65c-6427135b6a02} + + + + + + \ No newline at end of file diff --git a/.vs/rufus.vcxproj.filters b/.vs/rufus.vcxproj.filters new file mode 100644 index 00000000..fa818f9a --- /dev/null +++ b/.vs/rufus.vcxproj.filters @@ -0,0 +1,222 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/.vs/syslinux-libfat.vcxproj b/.vs/syslinux-libfat.vcxproj new file mode 100644 index 00000000..732904b0 --- /dev/null +++ b/.vs/syslinux-libfat.vcxproj @@ -0,0 +1,291 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + {8390DCE0-859D-4F57-AD9C-AAEAC4D77EEF} + Win32Proj + libfat + syslinux-libfat + 10.0 + + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4018;4244 + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX86 + + + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4018;4244 + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4018;4244 + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + Level3 + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4018;4244 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + MachineX86 + + + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4018;4244 + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4018;4244 + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4018;4244 + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX64 + + + + + Level3 + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4018;4244 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + Windows + true + true + true + + + MachineX64 + + + + + + \ No newline at end of file diff --git a/src/syslinux/libfat/.msvc/libfat.vcxproj.filters b/.vs/syslinux-libfat.vcxproj.filters similarity index 63% rename from src/syslinux/libfat/.msvc/libfat.vcxproj.filters rename to .vs/syslinux-libfat.vcxproj.filters index 8a20e022..514c11eb 100644 --- a/src/syslinux/libfat/.msvc/libfat.vcxproj.filters +++ b/.vs/syslinux-libfat.vcxproj.filters @@ -11,30 +11,33 @@ - + Header Files - + Header Files - + Header Files - + Header Files - + Source Files - + Source Files - + Source Files - + + Source Files + + Source Files diff --git a/.vs/syslinux-libinstaller.vcxproj b/.vs/syslinux-libinstaller.vcxproj new file mode 100644 index 00000000..8af68451 --- /dev/null +++ b/.vs/syslinux-libinstaller.vcxproj @@ -0,0 +1,290 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + {266502AC-CD74-4581-B707-938A7D05AD7A} + Win32Proj + libinstaller + syslinux-libinstaller + 10.0 + + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267 + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX86 + + + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267 + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267 + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + Level3 + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + MachineX86 + + + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267 + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267 + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267 + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX64 + + + + + Level3 + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + Windows + true + true + true + + + MachineX64 + + + + + + \ No newline at end of file diff --git a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj.filters b/.vs/syslinux-libinstaller.vcxproj.filters similarity index 66% rename from src/syslinux/libinstaller/.msvc/libinstaller.vcxproj.filters rename to .vs/syslinux-libinstaller.vcxproj.filters index 5cc1daa8..e6ec6ef1 100644 --- a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj.filters +++ b/.vs/syslinux-libinstaller.vcxproj.filters @@ -11,30 +11,30 @@ - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Source Files - + Source Files - + Source Files diff --git a/.vs/syslinux-win.vcxproj b/.vs/syslinux-win.vcxproj new file mode 100644 index 00000000..5e77cea3 --- /dev/null +++ b/.vs/syslinux-win.vcxproj @@ -0,0 +1,284 @@ + + + + + Debug + ARM + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + {7D2E9784-DDF7-4988-A887-CF099BC3B340} + Win32Proj + win + syslinux-win + 10.0 + + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + true + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm\$(Configuration)\ + $(SolutionDir)arm\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)arm64\$(Configuration)\ + $(SolutionDir)arm64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x86\$(Configuration)\ + $(SolutionDir)x86\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + $(SolutionDir)x64\$(Configuration)\ + $(SolutionDir)x64\$(Configuration)\$(ProjectName)\ + false + false + false + false + false + false + false + false + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267;4996 + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX86 + + + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267;4996 + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267;4996 + /utf-8 %(AdditionalOptions) + + + Windows + true + + + + + + Level3 + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267;4996 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + MachineX86 + + + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267;4996 + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + + + MaxSpeed + true + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267;4996 + /utf-8 %(AdditionalOptions) + true + + + + + + Level3 + Disabled + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreadedDebug + ProgramDatabase + 4244;4267;4996 + CompileAsC + /utf-8 %(AdditionalOptions) + + + Windows + true + + + MachineX64 + + + + + Level3 + inline=__inline;%(PreprocessorDefinitions) + ..\src;..\src\msvc-missing;%(AdditionalIncludeDirectories) + MultiThreaded + ProgramDatabase + 4244;4267;4996 + CompileAsC + /utf-8 %(AdditionalOptions) + true + + + Windows + true + true + true + + + MachineX64 + + + + + + \ No newline at end of file diff --git a/.vs/syslinux-win.vcxproj.filters b/.vs/syslinux-win.vcxproj.filters new file mode 100644 index 00000000..26aac8c5 --- /dev/null +++ b/.vs/syslinux-win.vcxproj.filters @@ -0,0 +1,23 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Header Files + + + + + Source Files + + + \ No newline at end of file diff --git a/ChangeLog.txt b/ChangeLog.txt index b86c943f..3200c139 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,579 @@ -o Version 1.4.4 (2013.02.26) +o Version 4.5 (2024.05.22) + Add new advanced option to perform runtime UEFI media validation of suitable images (Windows, most Linux) + Move the 'Use Rufus MBR' advanced option to a cheat mode (Alt-A) + Fix truncation of VHDX images, as well as a benign error message when writing VHD/VHDX + Fix support for Linux persistence in some configurations (Mint, Ubuntu 24.04) + Fix multiple potential vulnerabilities (with thanks to Mansour Gashasbi) + Update internal GRUB to version 2.12 + Update UEFI:NTFS to latest (now always uses the ntfs-3g driver, rather than the buggy AMI NTFS one) + Increase buffer size when copying ISO files, in an attempt to minimize the AMI NTFS UEFI driver bug + Improve partition creation handling + Don't display the WUE dialog when a conflicting 'unattend.xml' already exists + +o Version 4.4 (2024.01.17) + Add workaround for distros that use broken symbolic links as their UEFI bootloaders (such as Mint 21.3) + Add support for GRUB 2.12 + Fix a crash when saving .ffu images + Fix UEFI:NTFS partition not being added, in MBR mode, for some Linux ISOs + Prevent Microsoft Dev Drives from being listed + Improve support for SDXC card readers + Improve Large FAT32 formatting by aligning start of data regions to 1 MB (courtesy of Fred) + +o Version 4.3 (2023.10.19) + Add support for Rock Ridge symbolic links preservation when NTFS is used + Add an exception to enforce NTFS for Linux Mint's LMDE + Add an expert feature to restrict a Windows installation to S Mode + Fix persistence support for Debian 12 when booted in BIOS mode + Fix a regression that prevented the opening of .vhd images + Update UEFI:NTFS to report a more explicit error on bootmgr security issues + Improve the search for conflicting processes by running it in a background thread + Improve support for Slax Linux + +o Version 4.2 (2023.07.26) + Add detection and warning for UEFI revoked bootloaders (including ones revoked through SkuSiPolicy.p7b) + Add ZIP64 support, to extract .zip images that are larger than 4 GB + Add saving and restoring current drive to/from compressed VHDX image + Add saving and restoring current drive to/from compressed FFU (Full Flash Update) image [EXPERIMENTAL] + Fix a crash when trying to open Windows ISOs, with the MinGW compiled x86 32-bit version + Fix an issue where ISOs that contain a boot image with an 'EFI' label are not detected as bootable + Increase the ISO → ESP limit for Debian 12 netinst images + Ensure that the main partition size is aligned to the cluster size + +o Version 4.1 (2023.05.31) + Add timeouts on enumeration queries that may stall on some systems + Restore MS-DOS drive creation through the download of binaries from Microsoft + Update the log button icon + Fix UEFI:NTFS incompatibility with Windows Dev Kit 2023 platform + Fix more GRUB 'out of range pointer' errors with Ubuntu/Fedora when booting in BIOS mode + +o Version 4.0 (2023.04.26) + Fix persistent partition not working with Ubuntu 23.04 + Fix out of range pointer error with Ubuntu 23.04 when booting in BIOS mode + Fix boot freeze with Ubuntu Studio when Secure Boot is enabled + Fix incorrect architecture detection when checking for updates + Fix a Windows Store application crash when processing GRUB bootloaders + Fix a Windows Store application crash when enumerating processes that contain a % sign + Fix a Windows Store application crash when using German localization + Note that the major version was bumped on account of: + - New versions of Rufus requiring Windows 8 or later + - New versions of Rufus defaulting to a 64-bit executable + - Old versions of Rufus potentially not being able to update properly + +o Version 3.22 (2023.03.25) + Add SHA-1 and SHA-256 x86 acceleration on CPUs that support it (courtesy of Jeffrey Walton) + Add an option to disable BitLocker device encryption in the Windows User Experience dialog + Add a cheat mode (Ctrl-P) to preserve the log between sessions + Fix potential media creation errors by forcing the unmount of stale WIM images + Fix potential access errors in ISO → ESP mode by forcing Large FAT32 formatting + Fix user-specified label not being preserved on error/cancel + Fix some large SSD devices being listed by default + Fix processing of Rock Ridge CE fields + Work around the use of Rock Ridge symbolic links for Linux firmware packages (Debian) + Remove the ISO download feature on Windows 7 + Note: This is the last version of Rufus that can run on Windows 7 + +o Version 3.21 (2022.11.28) + Allow the provision of an arbitrary local account username in the Windows User Experience dialog + Improve Windows version reporting from ISO/.wim + Update UEFI:NTFS' NTFS drivers to v1.4 and exFAT drivers to v1.9 + Switch to remote download for nonstandard GRUB (Fedora 37, openSUSE Live, GeckoLinux) + Fix UEFI:NTFS partition not being set in MBR mode for ISOs with a >4GB file (UwUntu) + Fix GRUB support for Arch and derivatives, when a non FAT compliant label is used + Fix incorrect detection of GRUB with nonstandard prefixes + Fix tab order not working on the Windows User Experience dialog + +o Version 3.20 (2022.08.03) + Enable applicable Windows User Experience options for Windows 10 + Remember last Windows User Experience selection between sessions + Add automatic local account creation and regional options duplication + (NB: This is limited to creating an account with the same name as the current user and + with an empty password that the user will be prompted to change after first reboot) + Add a workaround for ISOs that have a 'syslinux' symbolic link to '/isolinux/' (Knoppix) + Revert to offline insertion of registry keys for the TPM/SB/RAM bypass where possible + Remove storage bypass, since this is a bogus bypass that doesn't do anything + Improve BIOS compatibility when displaying the "UEFI boot only" alert message + Fix Windows User Experience dialog appearing twice for Windows To Go + Fix Windows User Experience options not being applied for ARM64 + Fix Microsoft Account bypass not being applied unless TPM/SB/RAM bypass is selected + Fix overeager detection of GRUB2 bootloaders with nonstandard prefixes + +o Version 3.19 (2022.07.01) + Add a new selection dialog for Windows 11 setup customization: + - Secure Boot and TPM bypass have now been moved to this dialog + - Also allows to bypass the mandatory requirement for a Microsoft account on Windows 11 22H2 + (NB: Network *MUST* be temporarily disabled for the local account creation to be proposed) + - Also add an option to skip all collection questions (Sets all answers to "Don't allow") + - Also add an option for setting internal drives offline for Windows To Go + Note: These customization options are only proposed when using a Windows 11 image. + Add support for distros using a nonstandard GRUB 2.0 prefix directory (openSUSE Live, GeckoLinux) + Add the ability to ignore USBs (See https://github.com/pbatard/rufus/blob/master/res/rufus.ini) + Change drive listing to always list in increasing order of size + Update exceptions needed by Red Hat and derivatives for the 9.x releases + Update UEFI:NTFS drivers to latest + Reassign a letter for drives written in DD mode that don't have an ESP (e.g. CoreELEC) + Fix Windows refusing to mount Linux MBR partitions on FIXED drives + Fix support for multiextent files when Joliet is in use + +o Version 3.18 (2022.03.11) + Fix DLL sideloading vulnerabilities + Fix ISO → ESP creation when running on Windows 11 + Fix an issue when detecting network connectivity when the DHCP service is disabled + Update FreeDOS to version 1.3 + Add bypass of Windows 11 restrictions for in-place upgrades + Add Miracle Linux 8 to the list of Red Hat exceptions + Other internal fixes and improvements + +o Version 3.17 (2021.10.23) [BUGFIX RELEASE] + Fix MBR not being properly cleared + Fix commandline hogger not being deleted on exit + Improve ReFS handling for platforms that support it + Update UEFI:NTFS to latest and remove Secure Boot notice since this version is Secure Boot signed + Update Grub4DOS to latest + +o Version 3.16 (2021.10.13) + Fix ISO mode support for Red Hat 8.2+ and derivatives + Fix BIOS boot support for Arch derivatives + Fix removal of some boot entries for Ubuntu derivatives + Fix log not being saved on exit + Add Windows 11 "Extended" installation support (Disables TPM/Secure Boot requirements) + Add UEFI Shell ISO downloads + Add support for Intel NUC card readers + Improve Windows 11 support + Improve Windows version reporting + Speed up clearing of MBR/GPT + +o Version 3.15 (2021.08.03) + Update GRUB to version 2.06 + Add support for .vtsi files (Ventoy Sparse Image, courtesy of longpanda/ventoy) + Add workaround for openSUSE Live ISOs + Move default app directory to %LocalAppData%\Rufus\ and always save a log there on exit + Fix AppStore version of Rufus not being able to store downloaded files + Fix failure to open Syslinux/GRUB files when Rufus is located at the root of a drive + Prevent the creation of 'System Volume Information' on ESPs written in DD mode + Prevent drive letter assignation to the UEFI:NTFS partition + Prevent persistent partition creation errors due to size + Enhance safety checks before running the Fido ISO download script + Other internal fixes and improvements + +o Version 3.14 (2021.04.30) + Improve DD write speed (uncompressed images only) + Improve checksum computation speed + Improve network connectivity detection + Only prompt for additional GRUB/Syslinux downloads when not writing in DD mode + Fix potential "loss" of disk after writing Ubuntu 20.10 in DD mode + Fix GRUB compatibility issue with Ubuntu 21.04 + Fix Rufus MBR not being selected by default for Windows ISOs + Fix drag and drop being enabled during drive creation + Add more "exceptions" for forced DD image writing + +o Version 3.13 (2020.11.20) + Add a cheat mode (Alt-M) to accept disk images without a Boot Marker + Add marquee operation progress to the taskbar icon + Add zeroing/image writing progress to the log + Switch to using 0x55 and 0xAA instead of 0x00 and 0xFF for low pass badblock check + Switch to using fake/manufacturer units when computing the default label + Fix overnumerous write retries on error when writing a disk image + Work around Windows' abysmal handling of removable drives that contain an ESP + Improve mounting/unmounting of volumes + Update UEFI:NTFS file system drivers to version 1.7 + Other internal fixes and improvements (VDS, error reporting, etc.) + +o Version 3.12 (2020.10.14) + Add optional SHA-512 digest algorithm (Alt-H) + Add a cheat mode (Alt +/-) to increase/decrease application priority + Enable direct provision of install.wim/install.esd for Windows To Go + Move Windows To Go ESP to the beginning of the drive, on systems that allow it + Enforce a minimum volume size of 256 MB for ext2/ext3 partitions + Speed up the scanning of ISOs with lots of Rock Ridge deep directory entries + Fix detection of GRUB version and update embedded GRUB for Ubuntu 20.10 support + Fix user interface labels for accessibility + Work around a Windows bug where the wrong drive letter may be returned + +o Version 3.11 (2020.06.18) + Add Rock Ridge deep directory support + Add an option to write small ISOs to an ESP (GPT only) + Add a cheat mode (Ctrl-SELECT) to extract content from an additional zip archive on top of the ISO + Add a cheat mode (Alt-G) to disable Virtual Hard Disk listing + Add a cheat mode (Alt-P) to toggle a GPT ESP to Basic Data (Windows 10 only) + Fix improper x86 32-bit NTFS driver being used for UEFI:NTFS + Improve UEFI:NTFS compatibility with older UEFI firmwares + Improve startup time by running the ISO download feature check in the background + Remove Ubuntu's splash screen for persistent UEFI drives + Enable ASLR for the Rufus executable + +o Version 3.10 (2020.04.22) + Improve support for Ubuntu 20.04 + Improve detection of FIXED drives with no mounted partitions + Improve extfs formatting (courtesy of Marcos Mello) + Update UEFI:NTFS file system drivers to v1.5 + Fix progress not being updated when using the German localization + Fix primary GPT being overwritten when adding the protective MBR message + Fix a regression with lousy security solutions that prevent the creation of an 'autorun.inf' + Fix an assert during FreeDOS drive creation when the Windows system locale is set to UTF-8 + Fix invalid label errors when using a non-Western locale + +o Version 3.9 (2020.02.29) + Add exFAT support when creating blank UEFI:NTFS drives [EXPERIMENTAL] + Fix ext2/ext3 corruption for partitions larger than 4 GB + Fix early boot files not being usable on compressed NTFS partitions + Fix writing of compressed streams that don't end on sector boundary + Fix percent not being displayed on slow format + Improve file preallocation and speed up ISO extraction (courtesy of Mattiwatti) + Improve ext2/ext3 formatting speed + Improve protective MBR message for GPT partitioned drives + Improve reporting of Syslinux/GRUB download errors + Improve reporting of partition types and of Windows' version + Report the usage of UDF symbolic links + Update embedded Syslinux to 6.04-pre1 + +o Version 3.8 (2019.09.16) [BUGFIX RELEASE] + Fix regression where some ISOs (Debian) would produce a Syslinux error when booted in BIOS mode + Fix potential 0xC0030057 errors when trying to create a persistent partitions on a non-FIXED drive + +o Version 3.7 (2019.09.09) + Finalize persistent partition support for Debian and Ubuntu [EXPERIMENTAL]: + - Debian with persistence should work out of the box with any recent "Debian Live" ISO. + - Ubuntu with persistence should also work *IF* using a post 2019.08.01 ISO. Note that, + because of bug #1489855, trying to use persistence with Ubuntu ISOs that were released + before August 2019 will only result in rescue mode during boot - You have been warned! + - Other distros may work with persistence as long as they use a Debian-like or Ubuntu-like + method, and, in the case of Ubuntu-like, if they use casper with the #1489855 bugfix. + - Persistence and ext formatting support should still be considered EXPERIMENTAL at this stage. + Add cheat mode () to switch between percent/speed/ETA on *some* operations [EXPERIMENTAL] + Report SuperSpeed+ devices in the log (Come on USB-IF, just add "Ludicrous Speed" already!) + Fix UI checkboxes (Extended label, Fixes for old BIOSes) being cleared on START + Fix "Can't mount GUID volume" regression when creating Windows To Go drives + Fix "Volume label is invalid" error with empty labels on Windows 7 + Fix stale progress bar during standalone ext2/ext3 formatting + Fix an extraction failure with R-Drive Image bootable ISOs + Disable ISO mode for Pop_OS + Other cosmetic and internal improvements + +o Version 3.6 (2019.07.18) + Add support for persistent partitions [EXPERIMENTAL] + (Note: The above won't work with Ubuntu until Ubuntu bug #1489855 is properly fixed) + Add a mode to use VDS when partitioning/formatting (Alt-V) [EXPERIMENTAL] + Add full extraction support for efi.img (Solus) + Fix listing of potentially blocking processes + Fix NTFS not being selectable when using Grub4DOS + Fix download script not being launched when the user name contains a space + Fix translated messages potentially being truncated (e.g. Thai) + Fix progress bar report for screen readers (Accessibility issue) + Fix a regression where Windows format prompts would not be suppressed + Improve(?) Windows To Go support by following Microsoft's recommended partition order + Don't enumerate Windows Sandbox VHDs + Disable ISO mode when Manjaro ISOHybrids are being used + Update embedded GRUB to version 2.04 + +o Version 3.5 (2019.03.28) + Add a feature to download official retail Windows 8.1 or Windows 10 ISOs + (Note: 'Check for updates' must be enabled for the above to be active) + Add Windows To Go support for MCT generated Windows ISOs + Add a notice about the 'WppRecorder.sys' Microsoft bug for Windows 10 1809 ISOs + Add a notice about trying to format a drive larger than 2 TB in MBR mode + Add a notice about Legacy boot when trying to boot UEFI-only media in Legacy mode + Report the full PID and command line of potentially blocking processes in the log + Fix a potential silent abort when the drive is in use + Fix 'Quick Format' option always being activated + Fix potential change of the selected file system after an ISO has been loaded + Fix Win7 x64 EFI bootloader not being extracted in dual BIOS+UEFI mode (Alt-E) + +o Version 3.4 (2018.12.05) + Set the default image selection directory to Downloads\ instead of My Documents\ + Add ARM/ARM64 automatic update support + Improve UEFI:NTFS compatibility + Improve access issues by using VDS to delete all partitions + Update the .appx to include all architectures as well as request elevation + Fix broken detection of some EFI based images + Fix broken update check due to server switch + UI and accessibility fixes and improvements + +o Version 3.3 (2018.09.17) [BUGFIX RELEASE] + Fix a regression when processing uncompressed bootable DD images + Fix Windows To Go drive creation for ARM64 Windows ISOs + +o Version 3.2 (2018.09.11) + Add RSA-2048 signature validation on all the server downloads + Add "Fast zeroing" cheat mode (courtesy of René van der Zee) + Add support for XP/Server 2003 x64 ISOs (courtesy of Mattiwatti) + Improve ISO extraction performance by preallocating files (courtesy of Mattiwatti) + Improve bad blocks check algorithm (from suggestions by AL.Skywalker) + Fix progress not being displayed for Syslinux or GRUB downloads + Fix unwanted application close when cancelling an image scan + Fix an issue where FAT32 could still be selected for ISOs containing a >4GB file + +o Version 3.1 (2018.06.19) + Fix extraction of ISO content for GRUB based ISOs (Manjaro, Kaspersky, etc.) + Fix text being truncated on some dialogs (mostly Russian and Thai) + Add detection & warning about the 'Controlled Folder Access' Windows 10 feature + Improve retry attempts for transient errors + Increase size of the ESP to 300MB, for Windows To Go drives partitioned as GPT + Update GRUB 2.0 and Grub4DOS to latest + Update libcdio to latest + +o Version 3.0 (2018.05.29) + UI redesign to follow the flow of user operations (with thanks to Fahad Al-Riyami for the concept) + Drop XP and Vista platform support + Switch all downloads to SSL and use https://rufus.ie as the new base URL + Add ARM64 support for UEFI:NTFS + Fix delays when querying floppy drives during device enumeration + Improve support of efi.img files on Linux ISOs + Improve support for non-ISO9660 compliant openSUSE Leap ISOs + Improve translation support and remove manual positioning + Internal fixes and improvements + +o Version 2.18 (2017.11.07) + Ensure that the same drive is reselected on device refresh + Add a cheat mode to cycle the USB port of currently selected device + Make lookup for updatable .cfg file more generic (e.g. ESET SysRescue) + Fix handling of multiextent ISOs (e.g. BlackArch Linux) + Fix propagation of image decompression errors + Update grub4dos to latest + + IMPORTANT: THIS IS THE LAST RELEASE TO SUPPORT WINDOWS XP AND WINDOWS VISTA + SUBSEQUENT RUFUS RELEASES ARE *NO LONGER* COMPATIBLE WITH THESE PLATFORMS + +o Version 2.17 (2017.09.12) + Add support for Debian 9 live ISOs in UEFI mode + Add support for Super Floppy Disk "partitioning" mode + Add support for more non-USB card readers + Strengthen download update checks, to prevent attack scenarios that leverage user unawareness + Fix an issue with Spanish translation prompts not displaying properly + Fix an issue with Windows To Go support on some non-official Windows ISOs + Fix an issue with log autoscrolling + Fix an issue when using A: or B: as drive letters + +o Version 2.16 (2017.07.31) + Add an audiovisual cue on completion/error + Add a workaround for ISOs using nonstandard Rock Ridge extensions (looking at you Kali Linux!) + Notify user when an ISO is broken or truncated + Notify user if other processes are accessing the drive before format + List processes that are locking a drive on failure + Improve verbosity of the Windows To Go process + Other fixes and improvements + +o Version 2.15 (2017.05.17) + Fix non-listing of drives that are opened for write access by another process + Report external processes that may be preventing disk access (in the log) + Improve Windows To Go support for Windows 10 Creators Update + Don't report an error on checkdisk failure + Update GRUB 2.0 and Grub4DOS to latest + Other fixes and improvements + +o Version 2.14 (2017.04.10) [BUGFIX RELEASE] + Fix inability to create BIOS-bootable drives, in some circumstances, due to write sharing permissions + +o Version 2.13 (2017.04.06) + Preserve 'GPT for UEFI' option if the user changed it before selecting an ISO + Fix unwanted notification sound when closing with the X button (#893) + Fix inability to restore the minimized application after a popup is displayed (#896) + Fix an issue when trying to install Syslinux/NTFS twice in a row (#904) + Work around Microsoft's inconsistent casing of device IDs during device enumeration + Work around Microsoft's aggressive locking of partitions in Windows 10 Creators Update (#883) + Restrict write sharing permissions when accessing a device + Update libcdio and GRUB 2.0 to latest + +o Version 2.12 (2017.01.27) + Add Hebrew translation, courtesy of NSBuilder and פלוני אלמוני + Add a cheat mode (Alt-O) to create an ISO from the first optical media found + Enable target system selection for Windows To Go + Enable NTFS selection for Syslinux 6.x (EXPERIMENTAL) + Fix an issue that allowed BIOS target selection with pure UEFI images + Fix license display for RTL languages + Update Grub4DOS and FreeDOS to latest + Additional fixes and improvements + +o Version 2.11 (2016.09.08) + Do not download BIOS related files unless BIOS boot is selected + Improve support for Arch Linux derivatives + Add a cheat mode to disable drive indexing (Alt-Q) on format + Fix handling of 'Super Floppy Disk' formatted drives + Fix handling of misleading short write reports, for drives larger than 1 TB + Fix an issue that enabled FAT32 file system selection on some Windows images + Fix broken UI font for XP users + Fix sanitizing of exFAT labels + +o Version 2.10 (2016.07.20) + Add SHA-256 validation for downloaded files. You will now see an ✓ or ✗ in the log for relevant content + Add support for O2Micro PCI-E card readers + Add compressed NTFS support for UEFI:NTFS + Improve automatic closure of the Windows default format prompt + Improve support for Ubuntu (silence a benign warning), Springdale (use the actual label) and Antergos (Syslinux version detection) + Work around a Windows bug that can render a GPT disk inaccessible after cleanup (e.g. ChromeOS image) + Fix hash computation for content that isn't a multiple of 64 bytes (NB: This did not affect ISOs) + Fix Syslinux installation on some media, with huge thanks to 424778940z for the tests + Fix a corner case where settings could be altered after Start had been pressed, if a hotplug event also occurred + Additional fixes and improvements + +o Version 2.9 (2016.05.17) + Add ARM support for UEFI:NTFS + Fix UEFI:NTFS support for HP and Gigabyte firmwares (with thanks to Rod Smith and linnaea) + Fix unwanted listing of some internal removable drives + Fix the resurgence of a possible Syslinux installation crash + Fix missing default cluster size default on exFAT for >32GB drives + Fix the non-removal of the commandline hogger in some corner cases + Use "modern" file selection dialog on Vista or later (if you can spot the difference, good for you...) + +o Version 2.8 (2016.03.22) + Enable listing of non-USB card readers (EXPERIMENTAL) + Major speed improvement for checksum computation + Fix UI flicker during progress actualization + Fix computation of FAT size for Large FAT32 (with thanks to Ady) + Syslinux improvements + Update GRUB to 2.02~beta3 + +o Version 2.7 (2016.02.14) + Add Thai translation, courtesy of Sippapas Wangsri + Add Drag and Drop support, courtesy of SeymourApps + Add a retry for most write operations + Update UEFI:NTFS, ms-sys and Grub4DOS to latest + Dual sign Rufus with both SHA-1 and SHA-256 + Fix 2nd line of SHA-256 being hidden on some platforms + Fix shutdown prevention issues + Additional fixes & translation updates + +o Version 2.6 (2015.12.22) + Add Serbian (Latin) translation, courtesy of Ivan Strugar + Add a cheat mode to zero a device (Alt-Z) + Fix dual BIOS/UEFI mode not being disabled once enabled (Alt-E) + Fix a crash when Syslinux downloaded files are modified by a firewall + Fix FAT32 not being disabled for Windows ISOs in BIOS/CSM mode + Additional translation updates + +o Version 2.5 (2015.10.26) + Add SHA-256 checksum verification + Add a cheat mode to disable exclusive USB drive locking (Alt-,) + Add digital signature check on update downloads + Add Azerbaijani translation, courtesy of Elvin Məlikov + Add Persian translation, courtesy of Seyed Zia Azimi (ziaa) + Fix an issue where the update settings dialog may not display properly + Report Windows build number in the log (Windows 8 or later) + Many localization improvements and fixes, especially for right-to-left languages + Additional translation updates + +o Version 2.4 (2015.09.27) + Allow some settings and cheat modes to be persisted between sessions + Fix multiple issues with flash drive detection + Fix listing of drives that contain no media + Fix cheat mode to save the current USB to *uncompressed* VHD (Alt-V) + Fix an UI scaling issue with high DPI displays for non English languages + Update most of the translations + Additional cosmetic improvements + +o Version 2.3 (2015.08.28) + Detect ISOHybrid images and ask users how they should be written + Add MD5/SHA1 checksum verification ('#' button on the status bar) + Add Zip decompression support for DD Images + Add a cheat mode to save the current USB to *uncompressed* VHD (Alt-V) + Add a cheat mode for ISO timestamp preservation (Alt-T) + Add a cheat mode for USB enumeration debugging (Alt-.) + Disable MS-DOS creation for Windows 10 or later (FreeDOS is still available) + Fix Windows To Go creation issues, and enable access to internal disks + Fix UEFI support for Fedora ISOs + Fix some USB enumeration issues + Other improvements and fixes, including translation updates + +o Version 2.2 (2015.05.31) + Modernize the language selection button, courtesy of David Warner + Add keyboard accessibility, courtesy of David Warner + Add a clear indication of when UEFI-CSM is to be used + Fix an USB detection issue and add support for ASUS UASP "Turbo Mode" + Fix prevention of Windows shutdown when Rufus is idle + Improve UI on high DPI monitors + Update Grub4DOS to 0.4.6a [2015.05.18] + Other UI improvements and fixes, including translation updates + +o Version 2.1 (2015.03.23) + Add 32 bit support to UEFI:NTFS boot + Add standalone UEFI:NTFS boot installation, in advanced mode + Add Vietnamese translation, courtesy of thanhtai2009 + Disable support for ISOs that don't report their GRUB version (looking at you Kaspersky!) + Fix broken Windows UEFI installation when using GPT/NTFS + Fix creation of 32 bit UEFI Windows 10 installation flash drives + Other improvements + +o Version 2.0 (2015.03.03) + Major UI improvements (improved font, new info field, no separate progress dialog, etc.) + Add support for Windows To Go (if Rufus is running on Windows 8 or later) + Add support for Grub4DOS and GRUB 2 based images (e.g. FreeNAS) + Add portable application support, through a 'rufus.ini' file + Add native decompression support for DD images (.Z, .gz, .lzma, .bz2 and .xz) + Add seamless UEFI boot of NTFS partitions, for Windows ISOs with large files (>4GB) + Add support for Windows multipart 'install.swm' + Add support for non Microsoft VHD drivers + Add Norwegian translation, courtesy of JED + Fix a crash on image selection when no device is present + Fix broken VHD support for non-English version of Windows + Fix write error for DD images that are not a multiple of the sector size + Fix broken Unicode support + Update embedded Syslinux to 6.03 + Other improvements and fixes + +o Version 1.4.12 (2014.11.09) [BUGFIX RELEASE] + Fix support for Red Hat 7 and CentOS 7 + Fix support for Debian 7.x + Fix default listing of Mushkin Ventura Ultra USB 3.0 drives + Fix Czech translation, courtesy of Jakub Moc + Update Windows version listing for Windows 10 + +o Version 1.4.11 (2014.11.04) + Add Czech translation, courtesy of Richard Kahl + Add Ukrainian translation, courtesy of VKS + Fix formatting of drives with a large sector size (2K, 4K) + Fix UEFI boot for Tails and other Syslinux/EFI based ISOs + Fix listing of devices when all 26 drive letters are in use + Add a minimize button and minor UI changes + Other improvements + +o Version 1.4.10 (2014.08.15) + Fix a crash when scanning disk images with no USB drive plugged + Fix default detection of some OCZ flash drives + Improve Syslinux 6.x support (for Tails 1.x and other ISOs) + Improve disk image handling (refresh partitions, remount drive, etc.) + Other fixes and improvements + +o Version 1.4.9 (2014.06.08) [BUGFIX RELEASE] + Fix listing of drives for Windows XP and Windows Vista (reported by Alex Andrews) + +o Version 1.4.8 (2014.06.03) + Add KolibriOS ISO support + Add Arabic translation, courtesy of عمر الصمد + Add Croatian translation, courtesy of Dario Komar + Add Danish translation, courtesy of Jens Hansen + Add Latvian translation, courtesy of Aldis Tutins + Add Portuguese Brazilian translation, courtesy of Chateaubriand Vieira Moura + Allow the use of VHDs as DD image source (fixed disk/uncompressed only) + Report the detected USB speed in the log + Fix a long standing issue when launching Rufus using Far Manager + Fix support for pure UEFI bootable disk images + Fix detection for some Buffalo, Lacie, Samsung, Toshiba and Verbatim drives + Various other fixes and improvements + +o Version 1.4.7 (2014.04.22) + Add VHD support as a target, courtesy of Scott + Add ReFS support (only for Windows 8.1 or later and only for fixed drives) + Add a cheat mode to force the use of DD image writing for dual ISOs + Add Japanese translation, courtesy of Chantella Jackson + Add Slovak translation, courtesy of martinco78 + Add Swedish translation, courtesy of Sopor + Improve the display of filesizes when copying content + Fix FAT32 cluster transitions + Fix unpartitioned drives not always being listed + Fix bad blocks report + +o Version 1.4.6 (2014.03.17) + Display USB size in the dropdown list + Add Bulgarian translation, courtesy of Krasimir Nevenov + Improve checkbox handling in the UI and fix UDF/exFAT formatting issues + Fix replacement of obsolete vesamenu.c32 (reported by Liang) + Fix an issue that could prevent the download of files from the Rufus website + Fix untimely libcdio messages when processing Rock-Ridge ISOs (such as Ubuntu) + Other fixes + +o Version 1.4.5 (2014.02.27) [BUGFIX RELEASE] + Fix detection of fixed drives (reported by dominiquesb) + +o Version 1.4.4 (2014.02.26) Add *uncompressed* Disk Image support (FreeBSD, FreeNAS, etc.) Add right-to-left language support Add an alert when multiple partitions are about to be erased @@ -7,11 +582,11 @@ o Version 1.4.4 (2013.02.26) Ignore failure on ISO autorun.inf creation, to keep dumb security applications happy Improve hotplug detection Improve Syslinux v5+ support (requires an internet connection to download extra files) - Fix support for latest gparted, ArchLinux, and other Syslinux v5+ based ISOs + Fix support for latest gparted, ArchLinux, and other Syslinux v5+ based ISOs Fix detection for Toshiba drives (again) Fix UDF Unicode support -o Version 1.4.3 (2013.01.21) [BUGFIX RELEASE] +o Version 1.4.3 (2014.01.21) [BUGFIX RELEASE] Fix format operation not starting on Windows XP (reported by ank91) o Version 1.4.2 (2014.01.18) diff --git a/Makefile.am b/Makefile.am index d69a5c99..dfc8d20d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,14 @@ SUBDIRS = src TARGET = rufus +TAGVER = $(shell git log --oneline | wc -l) +SEDCMD = s/^\([ \t]*\)Version="\([0-9]*\)\.\([0-9]*\)\.[0-9]*\.\([0-9]*\)"\(.*\)/\1Version="\2.\3.@@TAGVER@@.\4"\5/ # This step produces the UPX compressed and signed releases that are made available for public download # NB: UPX v3.09 or later is needed for LZMA compression (http://upx.sourceforge.net/) release: all @mv src/$(TARGET)$(EXEEXT) . + @sleep 1 @$(STRIP) $(TARGET)$(EXEEXT) - @upx --lzma $(TARGET)$(EXEEXT) - @mv $(TARGET)$(EXEEXT) $(TARGET)_$(VERSION)$(EXEEXT) - @cmd.exe /k _sign.cmd $(TARGET)_$(VERSION)$(EXEEXT) + @upx --lzma --best $(TARGET)$(EXEEXT) + @mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) + @cmd.exe //c _sign.cmd $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) diff --git a/Makefile.in b/Makefile.in index 37a3822e..a3c4e7db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -43,34 +87,69 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = depcomp = am__depfiles_maybe = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_LDFLAGS = @AM_LDFLAGS@ +AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -80,6 +159,7 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DLLTOOL = @DLLTOOL@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -110,6 +190,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SUFFIX = @SUFFIX@ VERSION = @VERSION@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WINDRES = @WINDRES@ @@ -145,6 +226,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -155,10 +237,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = src TARGET = rufus +TAGVER = $(shell git log --oneline | wc -l) +SEDCMD = s/^\([ \t]*\)Version="\([0-9]*\)\.\([0-9]*\)\.[0-9]*\.\([0-9]*\)"\(.*\)/\1Version="\2.\3.@@TAGVER@@.\4"\5/ all: all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -194,22 +278,25 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -224,57 +311,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -290,12 +332,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -307,15 +344,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -324,9 +357,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files check-am: all-am check: check-recursive all-am: Makefile @@ -342,10 +397,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -426,31 +486,31 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive distclean distclean-generic \ - distclean-tags dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + cscope cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-tags dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-am uninstall uninstall-am # This step produces the UPX compressed and signed releases that are made available for public download # NB: UPX v3.09 or later is needed for LZMA compression (http://upx.sourceforge.net/) release: all @mv src/$(TARGET)$(EXEEXT) . + @sleep 1 @$(STRIP) $(TARGET)$(EXEEXT) - @upx --lzma $(TARGET)$(EXEEXT) - @mv $(TARGET)$(EXEEXT) $(TARGET)_$(VERSION)$(EXEEXT) - @cmd.exe /k _sign.cmd $(TARGET)_$(VERSION)$(EXEEXT) + @upx --lzma --best $(TARGET)$(EXEEXT) + @mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) + @cmd.exe //c _sign.cmd $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/README.md b/README.md new file mode 100644 index 00000000..ff0352d8 --- /dev/null +++ b/README.md @@ -0,0 +1,64 @@ +Rufus: The Reliable USB Formatting Utility +========================================== + +[![VS2022 Build Status](https://img.shields.io/github/actions/workflow/status/pbatard/rufus/vs2022.yml?branch=master&style=flat-square&label=VS2022%20Build)](https://github.com/pbatard/rufus/actions/workflows/vs2022.yml) +[![MinGW Build Status](https://img.shields.io/github/actions/workflow/status/pbatard/rufus/mingw.yml?branch=master&style=flat-square&label=MinGW%20Build)](https://github.com/pbatard/rufus/actions/workflows/mingw.yml) +[![Coverity Scan Status](https://img.shields.io/coverity/scan/2172.svg?style=flat-square&label=Coverity%20Analysis)](https://scan.coverity.com/projects/pbatard-rufus) +[![Latest Release](https://img.shields.io/github/release-pre/pbatard/rufus.svg?style=flat-square&label=Latest%20Release)](https://github.com/pbatard/rufus/releases) +[![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat-square&label=License)](https://www.gnu.org/licenses/gpl-3.0.en.html) +[![Download Stats](https://img.shields.io/github/downloads/pbatard/rufus/total.svg?label=Downloads&style=flat-square)](https://github.com/pbatard/rufus/releases) +[![Contributors](https://img.shields.io/github/contributors/pbatard/rufus.svg?style=flat-square&label=Contributors)](https://github.com/pbatard/rufus/graphs/contributors) + +![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icons/rufus-128.png) + +Rufus is a utility that helps format and create bootable USB flash drives. + +Features +-------- + +* Format USB, flash card and virtual drives to FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3 +* Create DOS bootable USB drives using [FreeDOS](https://www.freedos.org) or MS-DOS +* Create BIOS or UEFI bootable drives, including [UEFI bootable NTFS](https://github.com/pbatard/uefi-ntfs) +* Create bootable drives from bootable ISOs (Windows, Linux, etc.) +* Create bootable drives from bootable disk images, including compressed ones +* Create Windows 11 installation drives for PCs that don't have TPM or Secure Boot +* Create [Windows To Go](https://en.wikipedia.org/wiki/Windows_To_Go) drives +* Create VHD/DD, VHDX and FFU images of an existing drive +* Create persistent Linux partitions +* Compute MD5, SHA-1, SHA-256 and SHA-512 checksums of the selected image +* Perform runtime validation of UEFI bootable media +* Improve Windows installation experience by automatically setting up OOBE parameters (local account, privacy options, etc.) +* Perform bad blocks checks, including detection of "fake" flash drives +* Download official Microsoft Windows 8, Windows 10 or Windows 11 retail ISOs +* Download [UEFI Shell](https://github.com/pbatard/UEFI-Shell) ISOs +* Modern and familiar UI, with [38 languages natively supported](https://github.com/pbatard/rufus/wiki/FAQ#What_languages_are_natively_supported_by_Rufus) +* Small footprint. No installation required. +* Portable. Secure Boot compatible. +* 100% [Free Software](https://www.gnu.org/philosophy/free-sw) ([GPL v3](https://www.gnu.org/licenses/gpl-3.0)) + +Compilation +----------- + +Use either Visual Studio 2022 or MinGW and then invoke the `.sln` or `configure`/`make` respectively. + +#### Visual Studio + +Rufus is an OSI compliant Open Source project. You are entitled to +download and use the *freely available* [Visual Studio Community Edition](https://www.visualstudio.com/vs/community/) +to build, run or develop for Rufus. As per the Visual Studio Community Edition license, +this applies regardless of whether you are an individual or a corporate user. + +Additional information +---------------------- + +Rufus provides extensive information about what it is doing, either through its +easily accessible log, or through the [Windows debug facility](https://docs.microsoft.com/en-us/sysinternals/downloads/debugview). + +* [__Official Website__](https://rufus.ie) +* [FAQ](https://github.com/pbatard/rufus/wiki/FAQ) + +Enhancements/Bugs +----------------- + +Please use the [GitHub issue tracker](https://github.com/pbatard/rufus/issues) +for reporting problems or suggesting new features. diff --git a/README.txt b/README.txt deleted file mode 100644 index 0e478d8b..00000000 --- a/README.txt +++ /dev/null @@ -1,37 +0,0 @@ -Rufus: The Reliable USB Formatting Utility - -Features: -- Formats USB flash drives to FAT/FAT32/NTFS/UDF/exFAT -- Creates DOS bootable USB drives, using FreeDOS or MS-DOS with no external files required -- Creates MBR or GPT/UEFI bootable USB drives -- Creates bootable USB drives from bootable ISOs (Windows, Linux, etc.) -- Twice as fast as Microsoft's USB/DVD tool or UNetbootin, on ISO->USB (1) -- Can perform bad blocks check, with fake drive detection -- Modern and familiar UI, with more than 20 languages supported natively (2) -- Small footprint, no installation required -- 100% Free Software (GPL v3) - -Compilation: - Use either Visual Studio 2012, WDK 7.1 (Windows Driver Kit) or MinGW and then - invoke the .sln, wdk_build.cmd or configure/make respectively. - -Additional information: - Rufus provides extensive information about what it is doing, either through - its easily accessible log, or through the Windows debug facility. - -More info: - http://rufus.akeo.ie - http://rufus.akeo.ie/FAQ - -Enhancements/Bugs - https://github.com/pbatard/rufus/issues - - -(1) Tests carried out with a 16 GB USB 3.0 ADATA pen drive on a - Core 2 duo/4 GB RAM platform running Windows 7 x64. - ISO: en_windows_7_ultimate_with_sp1_x64_dvd_618240.iso - - Windows 7 USB/DVD Download Tool v1.0.30: 8 mins 10s - - UNetbootin v1.1.1.1: 6 mins 20s - - Rufus v1.1.0: 3 mins 25s - -(2) http://rufus.akeo.ie/translations \ No newline at end of file diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..b2dc36bf --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,7 @@ +# Reporting a Vulnerability + +To report a vulnerability for Rufus, please e-mail support@akeo.ie. + +If you find a vulnerability, we will ask you to respect [responsible disclosure](https://en.wikipedia.org/wiki/Responsible_disclosure) practices. + +In return, we will endeavour to respond to vulnerability reports within 48 hours. diff --git a/_chver.sh b/_chver.sh old mode 100644 new mode 100755 index 8a419799..a149b662 --- a/_chver.sh +++ b/_chver.sh @@ -5,12 +5,11 @@ type -P sed &>/dev/null || { echo "sed command not found. Aborting." >&2; exit 1; } if [ ! -n "$1" ]; then - echo "you must provide a version number (eg. 1.0.2)" + echo "you must provide a version number (eg. 2.1)" exit 1 else - MAJOR=`echo $1 | sed "s/\(.*\)[.].*[.].*/\1/"` - MINOR=`echo $1 | sed "s/.*[.]\(.*\)[.].*/\1/"` - MICRO=`echo $1 | sed "s/.*[.].*[.]\(.*\)/\1/"` + MAJOR=`echo $1 | sed "s/\(.*\)[.].*/\1/"` + MINOR=`echo $1 | sed "s/.*[.]\(.*\)/\1/"` fi case $MAJOR in *[!0-9]*) echo "$MAJOR is not a number" @@ -20,23 +19,19 @@ case $MINOR in *[!0-9]*) echo "$MINOR is not a number" exit 1 esac -case $MICRO in *[!0-9]*) - echo "$MICRO is not a number" - exit 1 -esac -echo "changing version to $MAJOR.$MINOR.$MICRO" -sed -i -e "s/^AC_INIT(\[\([^ ]*\)\], \[[^ ]*\]\(.*\)/AC_INIT([\1], [$MAJOR.$MINOR.$MICRO]\2/" configure.ac +echo "changing version to $MAJOR.$MINOR" +sed -i -e "s/^AC_INIT(\[\([^ ]*\)\], \[[^ ]*\]\(.*\)/AC_INIT([\1], [$MAJOR.$MINOR]\2/" configure.ac cat > cmd.sed <<\_EOF -s/^[ \t]*FILEVERSION[ \t]*.*,.*,.*,\(.*\)/ FILEVERSION @@MAJOR@@,@@MINOR@@,@@MICRO@@,\1/ -s/^[ \t]*PRODUCTVERSION[ \t]*.*,.*,.*,\(.*\)/ PRODUCTVERSION @@MAJOR@@,@@MINOR@@,@@MICRO@@,\1/ -s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*".*\..*\..*\.\(.*\)"/\1VALUE "FileVersion", "@@MAJOR@@.@@MINOR@@.@@MICRO@@.\2"/ -s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*".*\..*\..*\.\(.*\)"/\1VALUE "ProductVersion", "@@MAJOR@@.@@MINOR@@.@@MICRO@@.\2"/ -s/^\(.*\)"Rufus \(.*\)\.\(.*\)"\(.*\)/\1"Rufus @@MAJOR@@.@@MINOR@@.@@MICRO@@.\3"\4/ +s/^\([ \t]*\)\(FILE\|PRODUCT\)VERSION\([ \t]*\)[0-9]*,[0-9]*\(.*\)/\1\2VERSION\3@@MAJOR@@,@@MINOR@@\4/ +s/^\([ \t]*\)VALUE\([ \t]*\)"\(File\|Product\)Version",\([ \t]*\)"[0-9]*\.[0-9]*\.\(.*\)/\1VALUE\2"\3Version",\4"@@MAJOR@@.@@MINOR@@.\5/ +s/^\([ \t]*\)VALUE\([ \t]*\)"OriginalFilename",\([ \t]*\)"rufus-[0-9]*\.[0-9]*\.exe\(.*\)/\1VALUE\2"OriginalFilename",\3"rufus-@@MAJOR@@.@@MINOR@@.exe\4/ +s/^\(.*\)"Rufus [0-9]*\.[0-9]*\.\(.*\)"\(.*\)/\1"Rufus @@MAJOR@@.@@MINOR@@.\2"\3/ +s/^\([ \t]*\)Version="[0-9]*\.[0-9]*\.\(.*\)"\(.*\)/\1Version="@@MAJOR@@.@@MINOR@@.\2"\3/ +s/^set VERSION=[0-9]*\.[0-9]*/set VERSION=@@MAJOR@@.@@MINOR@@/ _EOF # First run sed to substitute our variable in the sed command file -sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" -e "s/@@MICRO@@/$MICRO/g" cmd.sed -sed -i -f cmd.sed src/rufus.rc -sed -i 's/$/\r/' src/rufus.rc +sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" cmd.sed +sed -b -i -f cmd.sed src/rufus.rc rm cmd.sed -source bootstrap.sh +source ./bootstrap.sh diff --git a/_coverity.cmd b/_coverity.cmd new file mode 100644 index 00000000..e44efd73 --- /dev/null +++ b/_coverity.cmd @@ -0,0 +1,26 @@ +@rem *** Internal developer script to run Coverity *** +@echo off +call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" +set COV_DIR=B:\cov-analysis-win64-2019.03 +set PATH=%PATH%;%COV_DIR%\bin +set PWD=%~dp0 +set TARGET=x86 +rmdir cov-int /s /q >NUL 2>NUL +rmdir %TARGET% /s /q >NUL 2>NUL +del cov-int.zip >NUL 2>NUL +mkdir cov-int +cov-build --dir cov-int msbuild rufus.sln /p:Configuration=Release,Platform=%TARGET% /maxcpucount +rem *** for when/if Coverity manage to clean their act +rem cov-build --dir cov-int C:\msys64\usr\bin\bash -cl "export PATH=/mingw32/bin:$PATH; cd /c/rufus; ./configure --build=i686-w64-mingw32 --host=i686-w64-mingw32 --disable-debug; make -j4" +rem *** zip script by Peter Mortensen - http://superuser.com/a/111266/286681 +echo Set objArgs = WScript.Arguments> zip.vbs +echo InputFolder = objArgs(0)>> zip.vbs +echo ZipFile = objArgs(1)>> zip.vbs +echo CreateObject("Scripting.FileSystemObject").CreateTextFile(ZipFile, True).Write "PK" ^& Chr(5) ^& Chr(6) ^& String(18, vbNullChar)>> zip.vbs +echo Set objShell = CreateObject("Shell.Application")>> zip.vbs +echo Set source = objShell.NameSpace(InputFolder)>> zip.vbs +echo objShell.NameSpace(ZipFile).CopyHere(source)>> zip.vbs +echo wScript.Sleep 8000>> zip.vbs +CScript zip.vbs %PWD%cov-int %PWD%cov-int.zip +del zip.vbs +pause diff --git a/_detect-amend.sh b/_detect-amend.sh new file mode 100644 index 00000000..286f57a3 --- /dev/null +++ b/_detect-amend.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# This script detects whether git commit is being executed in amend or regular mode +# Needed to determine whether the build number should be incremented or not. +# + +# Need to figure out if we are running on Windows or *NIX +if [ "$(uname -o)" = "Msys" ]; then + type -P PowerShell &>/dev/null || { echo "PowerShell command not found. Aborting." >&2; exit 1; } + type -P grep &>/dev/null || { echo "grep command not found. Aborting." >&2; exit 1; } + GITCMD=`PowerShell -command "Get-WmiObject win32_process -Filter \"name like '%git.exe'\" | select CommandLine"` + if $(echo $GITCMD | grep -q -- --amend); then + echo AMEND detected + touch ./.amend + fi +else + if $(ps -fp $PPID | grep -q -- --amend); then + echo AMEND detected + touch ./.amend + fi +fi diff --git a/_post-commit.sh b/_post-commit.sh deleted file mode 100644 index a60416e9..00000000 --- a/_post-commit.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# Creates a tag according to the number of commits on this branch -# -# To have git run this script on commit, create a "post-commit" text file in -# .git/hooks/ with the following content: -# #!/bin/sh -# if [ -x ./_post-commit.sh ]; then -# source ./_post-commit.sh -# fi - -type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1; } - -TAGVER=`cat ./.tag` -git tag "b$TAGVER" -rm ./.tag \ No newline at end of file diff --git a/_pre-commit.sh b/_pre-commit.sh old mode 100644 new mode 100755 index c32bd644..12469c41 --- a/_pre-commit.sh +++ b/_pre-commit.sh @@ -1,45 +1,43 @@ #!/bin/sh # -# Bumps the nano version according to the number of commits on this branch +# Bumps the micro version according to the number of commits on this branch # # To have git run this script on commit, create a "pre-commit" text file in # .git/hooks/ with the following content: # #!/bin/sh # if [ -x ./_pre-commit.sh ]; then -# source ./_pre-commit.sh +# . ./_pre-commit.sh # fi type -P sed &>/dev/null || { echo "sed command not found. Aborting." >&2; exit 1; } type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1; } -VER=`git log --oneline | wc -l` +if [ -x ./_detect-amend.sh ]; then + . ./_detect-amend.sh +fi + +BUILD=`git rev-list HEAD --count` # adjust so that we match the github commit count -TAGVER=`expr $VER + 1` -# there may be a better way to prevent improper nano on amend. For now the detection +((BUILD++)) +# there may be a better way to prevent improper micro on amend. For now the detection # of a .amend file in the current directory will do if [ -f ./.amend ]; then - TAGVER=`expr $TAGVER - 1` - git tag -d "b$TAGVER" + ((BUILD--)) rm ./.amend; fi -echo "setting nano to $TAGVER" -echo $TAGVER > .tag +echo "setting micro to $BUILD" cat > cmd.sed <<\_EOF -s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ FILEVERSION \1,\2,\3,@@TAGVER@@/ -s/^[ \t]*PRODUCTVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ PRODUCTVERSION \1,\2,\3,@@TAGVER@@/ -s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*"\(.*\)\..*"/\1VALUE "FileVersion", "\2.@@TAGVER@@"/ -s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*"\(.*\)\..*"/\1VALUE "ProductVersion", "\2.@@TAGVER@@"/ -s/^\(.*\)"Rufus \(.*\)\.\(.*\)"\(.*\)/\1"Rufus \2.@@TAGVER@@"\4/ +s/^\([ \t]*\)*\(FILE\|PRODUCT\)VERSION\([ \t]*\)\([0-9]*\),\([0-9]*\),[0-9]*,\(.*\)/\1\2VERSION\3\4,\5,@@BUILD@@,\6/ +s/^\([ \t]*\)VALUE\([ \t]*\)"\(File\|Product\)Version",\([ \t]*\)"\(.*\)\..*"[ \t]*/\1VALUE\2"\3Version",\4"\5.@@BUILD@@"/ +s/^\(.*\)"Rufus \(.*\)\..*"\(.*\)/\1"Rufus \2.@@BUILD@@"\3/ +s/^\([ \t]*\)Version="\([0-9]*\)\.\([0-9]*\)\.[0-9]*\.\([0-9]*\)"\(.*\)/\1Version="\2.\3.@@BUILD@@.\4"\5/ _EOF # First run sed to substitute our variable in the sed command file -sed -i -e "s/@@TAGVER@@/$TAGVER/g" cmd.sed - +sed -i -e "s/@@BUILD@@/$BUILD/g" cmd.sed # Run sed to update the nano version -sed -i -f cmd.sed src/rufus.rc -# MinGW's sed has the bad habit of eating CRLFs - make sure we keep 'em -sed -i 's/$/\r/' src/rufus.rc +sed -b -i -f cmd.sed src/rufus.rc # NB: we need to run git add else the modified files may be ignored git add src/rufus.rc diff --git a/_release.sh b/_release.sh old mode 100644 new mode 100755 index b4c9d2ae..32b3716e --- a/_release.sh +++ b/_release.sh @@ -1,5 +1,5 @@ #!/bin/sh rm -f rufus*.exe -./configure --disable-debug -make clean -make release +./configure --disable-debug "$@" +make -j12 clean +make -j12 release diff --git a/_set_git_hooks.sh b/_set_git_hooks.sh new file mode 100755 index 00000000..a92a4fb5 --- /dev/null +++ b/_set_git_hooks.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Sets the git hooks on a new git development system +if [ -e ".git/hooks/pre-commit" ]; then + echo 'pre-commit git hook is already set, aborting.' + exit +fi + +echo 'Creating pre-commit git hook...' +echo '#!/bin/sh' > .git/hooks/pre-commit +echo 'if [ -x ./_pre-commit.sh ]; then' >> .git/hooks/pre-commit +echo ' . ./_pre-commit.sh' >> .git/hooks/pre-commit +echo 'fi' >> .git/hooks/pre-commit diff --git a/_sign.cmd b/_sign.cmd index b876207d..ca68f4f1 100644 --- a/_sign.cmd +++ b/_sign.cmd @@ -1,6 +1,2 @@ -:retry -@set /p password=Please enter PFX password: -@"C:\Program Files (x86)\Windows Kits\8.0\bin\x64\signtool" sign /v /f D:\Secured\akeo\akeo.p12 /p %password% /tr http://timestamp.comodoca.com/rfc3161 %1 %2 %3 %4 -@if ERRORLEVEL 1 goto retry -@set password= -@exit +@echo off +"C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\signtool" sign /v /sha1 3dbc3a2a0e9ce8803b422cfdbc60acd33164965d /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 %* diff --git a/aclocal.m4 b/aclocal.m4 index 88a87407..88fd2554 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,16 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +32,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -110,22 +111,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -146,18 +144,21 @@ fi])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -170,7 +171,7 @@ fi])]) # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -199,31 +200,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -234,34 +244,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -283,7 +337,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -302,16 +356,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -327,15 +379,12 @@ AC_SUBST([am__leading_dot])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -343,11 +392,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -360,63 +408,35 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -427,24 +447,82 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -455,32 +533,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -490,36 +576,85 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -527,34 +662,32 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -562,24 +695,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -589,75 +720,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/bootstrap.sh b/bootstrap.sh old mode 100644 new mode 100755 index a90d6925..c61bb75c --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,5 +1,7 @@ #!/bin/sh +mkdir -p m4 aclocal || exit 1 automake -a -c || exit 1 autoconf || exit 1 rm -rf autom4te.cache +rm -d m4 diff --git a/compile b/compile new file mode 100644 index 00000000..0eb2633e --- /dev/null +++ b/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*|MSYS*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*|msys/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/configure b/configure old mode 100644 new mode 100755 index 1a43d392..667af6b2 --- a/configure +++ b/configure @@ -1,13 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for rufus 1.4.4. +# Generated by GNU Autoconf 2.71 for rufus 4.6. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -18,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -35,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -83,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -98,8 +92,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -111,40 +109,47 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -164,41 +169,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -206,39 +223,51 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : - - if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + + if test "x$CONFIG_SHELL" != x +then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: https://github.com/pbatard/rufus/issues about your $0: system, including any error possibly output before this $0: message. Then install a modern shell, or manually run @@ -266,6 +295,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -283,6 +313,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -297,7 +335,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -306,7 +344,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -331,18 +369,27 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -354,18 +401,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -377,9 +433,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -406,7 +462,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -450,8 +506,12 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -460,6 +520,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -473,6 +537,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -486,16 +557,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -507,28 +578,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -560,23 +611,26 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='1.4.4' -PACKAGE_STRING='rufus 1.4.4' +PACKAGE_VERSION='4.6' +PACKAGE_STRING='rufus 4.6' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' -PACKAGE_URL='http://rufus.akeo.ie' +PACKAGE_URL='https://rufus.ie' ac_unique_file="src/rufus.c" ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +SUFFIX AM_LDFLAGS AM_CFLAGS VISIBILITY_CFLAGS WINDRES +DLLTOOL RM SED RANLIB +AR OBJEXT EXEEXT ac_ct_CC @@ -586,6 +640,8 @@ CFLAGS CC AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -628,6 +684,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -652,6 +709,9 @@ ac_user_opts=' enable_option_checking enable_silent_rules enable_debug +enable_alpha +enable_beta +enable_test ' ac_precious_vars='build_alias host_alias @@ -699,6 +759,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -728,8 +789,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -770,9 +829,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -796,9 +855,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -951,6 +1010,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1000,9 +1068,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1016,9 +1084,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1062,9 +1130,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1080,7 +1148,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1088,7 +1156,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1116,8 +1184,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1146,7 +1212,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1203,7 +1269,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rufus 1.4.4 to adapt to many kinds of systems. +\`configure' configures rufus 4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1243,6 +1309,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1269,7 +1336,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 1.4.4:";; + short | recursive ) echo "Configuration of rufus 4.6:";; esac cat <<\_ACEOF @@ -1277,9 +1344,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --enable-debug keep debug symbols for gdb (default=yes) + --enable-alpha build an ALPHA release (default=no) + --enable-beta build a BETA release (default=no) + --enable-test=# build a TEST release (default=no) Some influential environment variables: CC C compiler command @@ -1294,7 +1364,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. Report bugs to . -rufus home page: . +rufus home page: . _ACEOF ac_status=$? fi @@ -1310,9 +1380,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1340,7 +1410,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1348,7 +1419,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1357,10 +1428,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 1.4.4 -generated by GNU Autoconf 2.68 +rufus configure 4.6 +generated by GNU Autoconf 2.71 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1377,14 +1448,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1392,14 +1463,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1408,14 +1480,34 @@ fi as_fn_set_status $ac_retval } # ac_fn_c_try_compile +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rufus $as_me 1.4.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by rufus $as_me 4.6, which was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -1448,8 +1540,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -1484,7 +1580,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -1519,11 +1615,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -1534,8 +1632,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -1559,7 +1657,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -1567,14 +1665,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -1582,15 +1680,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -1598,8 +1696,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -1613,65 +1711,50 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1679,19 +1762,424 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (char **p, int i) +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); +extern void free (void *); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + + +# Auxiliary files required by this configure script. +ac_aux_files="compile missing install-sh" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -1702,12 +2190,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -1716,24 +2204,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1743,11 +2231,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -1760,38 +2249,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.11' - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +am__api_version='1.14' -# Find a good install program. We prefer a C program (faster), + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -1805,20 +2267,25 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -1828,13 +2295,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -1842,12 +2309,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -1863,7 +2330,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -1873,8 +2340,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1884,47 +2351,52 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -1934,8 +2406,18 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -1944,12 +2426,13 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -if test x"${MISSING+set}" != xset; then + + if test x"${MISSING+set}" != xset; then case $am_aux_dir in *\ * | *\ *) MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; @@ -1958,12 +2441,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -1975,19 +2458,20 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -1995,11 +2479,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2010,11 +2498,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2023,11 +2511,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -2035,11 +2524,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2050,11 +2543,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -2062,8 +2555,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -2075,25 +2568,31 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + 'BusyBox '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done @@ -2104,7 +2603,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -2114,24 +2613,19 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } - -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -2139,11 +2633,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2154,24 +2652,25 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -2187,12 +2686,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2205,6 +2704,47 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test ${enable_silent_rules+y} +then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2227,17 +2767,13 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='1.4.4' + VERSION='4.6' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -2255,36 +2791,124 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + -# Enable silent build rules by default (Automake v1.11 or later). -# Disable by either passing --disable-silent-rules to configure or passing V=1 to make # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac +am_make=${MAKE-make} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi AM_BACKSLASH='\' + + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2293,11 +2917,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2305,11 +2930,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2320,11 +2949,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2333,11 +2962,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2345,11 +2975,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2360,11 +2994,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2372,8 +3006,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2386,11 +3020,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2398,11 +3033,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2413,11 +3052,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2426,11 +3065,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2439,15 +3079,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2463,18 +3107,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2485,11 +3129,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2497,11 +3142,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2512,11 +3161,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2529,11 +3178,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2541,11 +3191,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2556,11 +3210,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2572,8 +3226,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2581,25 +3235,129 @@ esac fi fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2609,7 +3367,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -2617,7 +3375,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -2629,9 +3387,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -2652,11 +3410,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2673,7 +3432,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2689,44 +3448,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2740,15 +3501,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -2757,7 +3518,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -2769,8 +3530,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -2778,10 +3539,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -2789,39 +3550,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -2835,11 +3597,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -2848,31 +3611,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -2882,29 +3646,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -2913,57 +3681,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -2978,95 +3749,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -3075,14 +3895,180 @@ 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 + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +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 + + +# autoconf 2.61 doesn't have AC_PROG_AR, but 2.63 has it + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="ar" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_AR" = x; then + AR=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +else + AR="$ac_cv_prog_AR" +fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -3090,11 +4076,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3105,11 +4095,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3118,11 +4108,12 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -3130,11 +4121,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3145,11 +4140,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -3157,8 +4152,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -3167,11 +4162,12 @@ else RANLIB="$ac_cv_prog_RANLIB" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -3185,11 +4181,16 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -3197,13 +4198,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3231,18 +4232,19 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_RM+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_RM+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $RM in [\\/]* | ?:[\\/]*) ac_cv_path_RM="$RM" # Let the user override the test with a path. @@ -3252,11 +4254,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_RM="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3269,22 +4275,125 @@ esac fi RM=$ac_cv_path_RM if test -n "$RM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5 -$as_echo "$RM" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RM" >&5 +printf "%s\n" "$RM" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +printf "%s\n" "$DLLTOOL" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +printf "%s\n" "$ac_ct_DLLTOOL" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -3292,11 +4401,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3307,11 +4420,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3320,11 +4433,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -3332,11 +4446,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3347,20 +4465,20 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then - STRIP="strip" + STRIP=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -3372,11 +4490,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_WINDRES+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_WINDRES+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$WINDRES"; then ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. else @@ -3384,11 +4503,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3399,11 +4522,11 @@ fi fi WINDRES=$ac_cv_prog_WINDRES if test -n "$WINDRES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 -$as_echo "$WINDRES" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 +printf "%s\n" "$WINDRES" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3412,11 +4535,12 @@ if test -z "$ac_cv_prog_WINDRES"; then ac_ct_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_WINDRES+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_WINDRES+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_WINDRES"; then ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. else @@ -3424,11 +4548,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_WINDRES="windres" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3439,20 +4567,20 @@ fi fi ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES if test -n "$ac_ct_WINDRES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 -$as_echo "$ac_ct_WINDRES" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 +printf "%s\n" "$ac_ct_WINDRES" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_WINDRES" = x; then - WINDRES="windres" + WINDRES=":" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac WINDRES=$ac_ct_WINDRES @@ -3462,32 +4590,34 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +printf %s "checking for inline... " >&6; } +if test ${ac_cv_c_inline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } +static $ac_kw foo_t static_foo (void) {return 0; } +$ac_kw foo_t foo (void) {return 0; } #endif _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_inline=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +printf "%s\n" "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -3505,19 +4635,20 @@ _ACEOF esac -$as_echo "#define _GNU_SOURCE /**/" >>confdefs.h +printf "%s\n" "#define _GNU_SOURCE /**/" >>confdefs.h -# Clang needs an explicit WIN32_WINNT defined else it produces warnings -# in msapi_utf8.h - including winver.h only doesn't work -AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" -AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined" +AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 -D_WIN32_IE=0x0A00" +# "-Wl,--nxcompat" to enable DEP (Data Execution Prevention) +# "-Wl,--dynamicbase" to enable ASLR (Address Space Layout Randomization) +AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined -Wl,--nxcompat -Wl,--no-insert-timestamp -Wl,--dynamicbase" # Debug symbols # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : +if test ${enable_debug+y} +then : enableval=$enable_debug; debug_enabled=$enableval -else +else $as_nop debug_enabled='yes' fi @@ -3528,8 +4659,47 @@ else LDFLAGS="-s" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling Large File Support (ISO support)" >&5 -$as_echo "enabling Large File Support (ISO support)" >&6; } +# Alpha/Beta/Test +# Check whether --enable-alpha was given. +if test ${enable_alpha+y} +then : + enableval=$enable_alpha; alpha_enabled=$enableval +else $as_nop + alpha_enabled='no' +fi + +if test "x$alpha_enabled" != "xno" ; then + CFLAGS+=" -DALPHA" + SUFFIX=_ALPHA +fi +# Check whether --enable-beta was given. +if test ${enable_beta+y} +then : + enableval=$enable_beta; beta_enabled=$enableval +else $as_nop + beta_enabled='no' +fi + +if test "x$beta_enabled" != "xno" ; then + CFLAGS+=" -DBETA" + SUFFIX=_BETA +fi +# Check whether --enable-test was given. +if test ${enable_test+y} +then : + enableval=$enable_test; test_enabled=$enableval +else $as_nop + test_enabled='no' +fi + +if test "x$test_enabled" != "xno" ; then + if test "x$test_enabled" == "xyes" ; then $enableval="" ; fi + CFLAGS+=" -DTEST=$enableval" + SUFFIX=_TEST$enableval +fi + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: enabling Large File Support (ISO support)" >&5 +printf "%s\n" "enabling Large File Support (ISO support)" >&6; } AM_CFLAGS="$AM_CFLAGS -D_FILE_OFFSET_BITS=64 -D_OFF_T_ -D_off_t=off64_t -Doff_t=off64_t -Doff32_t=long" # check for -Wno-pointer-sign compiler support (GCC >= 4) @@ -3539,22 +4709,24 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : nopointersign_cflags="-Wno-pointer-sign" -else +else $as_nop nopointersign_cflags="" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="${saved_CFLAGS}" -AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags" +AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -UNDEBUG -DCOBJMACROS -D__USE_MINGW_ANSI_STDIO=0 -std=gnu99 -Wshadow -Wall -Wformat-security -Wundef -Wunused -Wstrict-prototypes -Wno-restrict -Wno-array-bounds -Werror-implicit-function-declaration -Wbidi-chars=none $nopointersign_cflags" + @@ -3562,13 +4734,13 @@ AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-protot ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files .mingw/Makefile" + ac_config_files="$ac_config_files src/Makefile" -ac_config_files="$ac_config_files src/ms-sys/Makefile" +ac_config_files="$ac_config_files src/bled/Makefile" -ac_config_files="$ac_config_files src/syslinux/libfat/Makefile" - -ac_config_files="$ac_config_files src/syslinux/libinstaller/Makefile" +ac_config_files="$ac_config_files src/ext2fs/Makefile" ac_config_files="$ac_config_files src/libcdio/iso9660/Makefile" @@ -3576,7 +4748,15 @@ ac_config_files="$ac_config_files src/libcdio/udf/Makefile" ac_config_files="$ac_config_files src/libcdio/driver/Makefile" -ac_config_files="$ac_config_files res/localization/Makefile" +ac_config_files="$ac_config_files res/loc/Makefile" + +ac_config_files="$ac_config_files src/ms-sys/Makefile" + +ac_config_files="$ac_config_files src/syslinux/libfat/Makefile" + +ac_config_files="$ac_config_files src/syslinux/libinstaller/Makefile" + +ac_config_files="$ac_config_files src/syslinux/win/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3605,8 +4785,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -3636,15 +4816,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -3658,8 +4838,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -3712,7 +4892,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -3723,6 +4903,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -3736,8 +4924,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -3760,14 +4948,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -3777,46 +4967,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -3825,13 +5015,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -3840,8 +5023,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -3853,30 +5040,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -3889,13 +5056,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -3922,18 +5090,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -3945,12 +5115,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -3981,7 +5152,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -4003,6 +5174,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -4016,6 +5191,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -4029,16 +5210,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -4057,7 +5238,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -4066,7 +5247,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -4098,28 +5279,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4140,8 +5309,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rufus $as_me 1.4.4, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by rufus $as_me 4.6, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4188,17 +5357,19 @@ Configuration files: $config_files Report bugs to . -rufus home page: ." +rufus home page: ." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -rufus config.status 1.4.4 -configured by $0, generated by GNU Autoconf 2.68, +rufus config.status 4.6 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -4238,21 +5409,21 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -4278,9 +5449,9 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -4294,7 +5465,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -4308,16 +5479,20 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + ".mingw/Makefile") CONFIG_FILES="$CONFIG_FILES .mingw/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/ms-sys/Makefile") CONFIG_FILES="$CONFIG_FILES src/ms-sys/Makefile" ;; - "src/syslinux/libfat/Makefile") CONFIG_FILES="$CONFIG_FILES src/syslinux/libfat/Makefile" ;; - "src/syslinux/libinstaller/Makefile") CONFIG_FILES="$CONFIG_FILES src/syslinux/libinstaller/Makefile" ;; + "src/bled/Makefile") CONFIG_FILES="$CONFIG_FILES src/bled/Makefile" ;; + "src/ext2fs/Makefile") CONFIG_FILES="$CONFIG_FILES src/ext2fs/Makefile" ;; "src/libcdio/iso9660/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcdio/iso9660/Makefile" ;; "src/libcdio/udf/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcdio/udf/Makefile" ;; "src/libcdio/driver/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcdio/driver/Makefile" ;; - "res/localization/Makefile") CONFIG_FILES="$CONFIG_FILES res/localization/Makefile" ;; + "res/loc/Makefile") CONFIG_FILES="$CONFIG_FILES res/loc/Makefile" ;; + "src/ms-sys/Makefile") CONFIG_FILES="$CONFIG_FILES src/ms-sys/Makefile" ;; + "src/syslinux/libfat/Makefile") CONFIG_FILES="$CONFIG_FILES src/syslinux/libfat/Makefile" ;; + "src/syslinux/libinstaller/Makefile") CONFIG_FILES="$CONFIG_FILES src/syslinux/libinstaller/Makefile" ;; + "src/syslinux/win/Makefile") CONFIG_FILES="$CONFIG_FILES src/syslinux/win/Makefile" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -4327,7 +5502,7 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files fi # Have a temporary directory for convenience. Make it in the build tree @@ -4525,7 +5700,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -4553,9 +5728,9 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -4563,24 +5738,24 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac case $ac_tag in *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -4590,7 +5765,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -4614,9 +5789,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -4678,8 +5853,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -4723,9 +5898,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -4772,7 +5947,8 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi 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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/configure.ac b/configure.ac index 92aa700c..513ab26d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,26 +1,27 @@ -AC_INIT([rufus], [1.4.4], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) +AC_INIT([rufus], [4.6], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) -# Enable silent build rules by default (Automake v1.11 or later). -# Disable by either passing --disable-silent-rules to configure or passing V=1 to make -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +AM_SILENT_RULES([yes]) AC_PREREQ([2.50]) AC_PROG_CC +# autoconf 2.61 doesn't have AC_PROG_AR, but 2.63 has it +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) +AC_PROG_AR AC_PROG_RANLIB AC_PROG_SED AC_PATH_PROG(RM, rm, rm) -AC_CHECK_TOOL(STRIP, strip, strip) -AC_CHECK_TOOL(WINDRES, windres, windres) +AC_CHECK_TOOL(DLLTOOL, dlltool, :) +AC_CHECK_TOOL(STRIP, strip, :) +AC_CHECK_TOOL(WINDRES, windres, :) AC_C_INLINE AC_DEFINE([_GNU_SOURCE], [], [Use GNU extensions]) -# Clang needs an explicit WIN32_WINNT defined else it produces warnings -# in msapi_utf8.h - including winver.h only doesn't work -AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" -AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined" +AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x0A00 -D_WIN32_WINNT=0x0A00 -D_WIN32_IE=0x0A00" +# "-Wl,--nxcompat" to enable DEP (Data Execution Prevention) +# "-Wl,--dynamicbase" to enable ASLR (Address Space Layout Randomization) +AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined -Wl,--nxcompat -Wl,--no-insert-timestamp -Wl,--dynamicbase" # Debug symbols AC_ARG_ENABLE([debug], @@ -35,6 +36,24 @@ else LDFLAGS="-s" fi +# Alpha/Beta/Test +AC_ARG_ENABLE([alpha],[AS_HELP_STRING([--enable-alpha], [build an ALPHA release (default=no)])], [alpha_enabled=$enableval], [alpha_enabled='no']) +if test "x$alpha_enabled" != "xno" ; then + CFLAGS+=" -DALPHA" + SUFFIX=_ALPHA +fi +AC_ARG_ENABLE([beta],[AS_HELP_STRING([--enable-beta], [build a BETA release (default=no)])], [beta_enabled=$enableval], [beta_enabled='no']) +if test "x$beta_enabled" != "xno" ; then + CFLAGS+=" -DBETA" + SUFFIX=_BETA +fi +AC_ARG_ENABLE([test],[AS_HELP_STRING([--enable-test=#], [build a TEST release (default=no)])], [test_enabled=$enableval], [test_enabled='no']) +if test "x$test_enabled" != "xno" ; then + if test "x$test_enabled" == "xyes" ; then $enableval="" ; fi + CFLAGS+=" -DTEST=$enableval" + SUFFIX=_TEST$enableval +fi + AC_MSG_RESULT([enabling Large File Support (ISO support)]) AM_CFLAGS="$AM_CFLAGS -D_FILE_OFFSET_BITS=64 -D_OFF_T_ -D_off_t=off64_t -Doff_t=off64_t -Doff32_t=long" @@ -45,19 +64,24 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [nopointersign_cflags="-Wno-pointer-sign"], [nopointersign_cflags=""]) CFLAGS="${saved_CFLAGS}" -AM_CFLAGS="$AM_CFLAGS -std=gnu99 -Wshadow -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags" +AM_CFLAGS="$AM_CFLAGS -DUNICODE -D_UNICODE -UNDEBUG -DCOBJMACROS -D__USE_MINGW_ANSI_STDIO=0 -std=gnu99 -Wshadow -Wall -Wformat-security -Wundef -Wunused -Wstrict-prototypes -Wno-restrict -Wno-array-bounds -Werror-implicit-function-declaration -Wbidi-chars=none $nopointersign_cflags" AC_SUBST([VISIBILITY_CFLAGS]) AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_LDFLAGS]) +AC_SUBST([SUFFIX]) AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([.mingw/Makefile]) AC_CONFIG_FILES([src/Makefile]) -AC_CONFIG_FILES([src/ms-sys/Makefile]) -AC_CONFIG_FILES([src/syslinux/libfat/Makefile]) -AC_CONFIG_FILES([src/syslinux/libinstaller/Makefile]) +AC_CONFIG_FILES([src/bled/Makefile]) +AC_CONFIG_FILES([src/ext2fs/Makefile]) AC_CONFIG_FILES([src/libcdio/iso9660/Makefile]) AC_CONFIG_FILES([src/libcdio/udf/Makefile]) AC_CONFIG_FILES([src/libcdio/driver/Makefile]) -AC_CONFIG_FILES([res/localization/Makefile]) +AC_CONFIG_FILES([res/loc/Makefile]) +AC_CONFIG_FILES([src/ms-sys/Makefile]) +AC_CONFIG_FILES([src/syslinux/libfat/Makefile]) +AC_CONFIG_FILES([src/syslinux/libinstaller/Makefile]) +AC_CONFIG_FILES([src/syslinux/win/Makefile]) AC_OUTPUT diff --git a/install-sh b/install-sh index e3e4aa8e..ec298b53 100644 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,25 +35,21 @@ scriptversion=2009-04-28.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,22 +64,16 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -97,7 +87,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -114,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,42 +137,62 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; + + -p) cpprog="$cpprog -p";; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - shift;; + -S) backupsuffix="$2" + shift;; - -T) no_target_directory=true;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -186,6 +206,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -194,13 +218,26 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -211,16 +248,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -228,9 +265,9 @@ fi for src do - # Protect names starting with `-'. + # Protect names problematic for 'test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -238,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -252,185 +293,150 @@ do echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac + posix_mkdir=false + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else - mkdir_mode= + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + trap '' 0;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test -z "$d" && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -443,14 +449,25 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -465,20 +482,24 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -486,24 +507,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -512,10 +533,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: - \ No newline at end of file diff --git a/missing b/missing index 28055d2a..db98974f 100644 --- a/missing +++ b/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -100,272 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` +# Run the given program, remember its exit status. +"$@"; st=$? -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/res/appstore/.editorconfig b/res/appstore/.editorconfig new file mode 100644 index 00000000..c904bba6 --- /dev/null +++ b/res/appstore/.editorconfig @@ -0,0 +1,8 @@ +# indicate this is the root of the project +root = true + +[*] +charset = utf-8-bom +insert_final_newline = true +indent_style = space +trim_trailing_whitespace = true diff --git a/res/appstore/Images/LargeTile.scale-100.png b/res/appstore/Images/LargeTile.scale-100.png new file mode 100644 index 00000000..cd06727a Binary files /dev/null and b/res/appstore/Images/LargeTile.scale-100.png differ diff --git a/res/appstore/Images/LargeTile.scale-125.png b/res/appstore/Images/LargeTile.scale-125.png new file mode 100644 index 00000000..9c84ab48 Binary files /dev/null and b/res/appstore/Images/LargeTile.scale-125.png differ diff --git a/res/appstore/Images/LargeTile.scale-150.png b/res/appstore/Images/LargeTile.scale-150.png new file mode 100644 index 00000000..f0dd118b Binary files /dev/null and b/res/appstore/Images/LargeTile.scale-150.png differ diff --git a/res/appstore/Images/LargeTile.scale-200.png b/res/appstore/Images/LargeTile.scale-200.png new file mode 100644 index 00000000..59eb9555 Binary files /dev/null and b/res/appstore/Images/LargeTile.scale-200.png differ diff --git a/res/appstore/Images/LargeTile.scale-400.png b/res/appstore/Images/LargeTile.scale-400.png new file mode 100644 index 00000000..a0acb618 Binary files /dev/null and b/res/appstore/Images/LargeTile.scale-400.png differ diff --git a/res/appstore/Images/SmallTile.scale-100.png b/res/appstore/Images/SmallTile.scale-100.png new file mode 100644 index 00000000..d6eff74c Binary files /dev/null and b/res/appstore/Images/SmallTile.scale-100.png differ diff --git a/res/appstore/Images/SmallTile.scale-125.png b/res/appstore/Images/SmallTile.scale-125.png new file mode 100644 index 00000000..20db0e9d Binary files /dev/null and b/res/appstore/Images/SmallTile.scale-125.png differ diff --git a/res/appstore/Images/SmallTile.scale-150.png b/res/appstore/Images/SmallTile.scale-150.png new file mode 100644 index 00000000..5f2cf3ca Binary files /dev/null and b/res/appstore/Images/SmallTile.scale-150.png differ diff --git a/res/appstore/Images/SmallTile.scale-200.png b/res/appstore/Images/SmallTile.scale-200.png new file mode 100644 index 00000000..99086c65 Binary files /dev/null and b/res/appstore/Images/SmallTile.scale-200.png differ diff --git a/res/appstore/Images/SmallTile.scale-400.png b/res/appstore/Images/SmallTile.scale-400.png new file mode 100644 index 00000000..30907e60 Binary files /dev/null and b/res/appstore/Images/SmallTile.scale-400.png differ diff --git a/res/appstore/Images/Square150x150Logo.scale-100.png b/res/appstore/Images/Square150x150Logo.scale-100.png new file mode 100644 index 00000000..5f7dc574 Binary files /dev/null and b/res/appstore/Images/Square150x150Logo.scale-100.png differ diff --git a/res/appstore/Images/Square150x150Logo.scale-125.png b/res/appstore/Images/Square150x150Logo.scale-125.png new file mode 100644 index 00000000..8dbe669d Binary files /dev/null and b/res/appstore/Images/Square150x150Logo.scale-125.png differ diff --git a/res/appstore/Images/Square150x150Logo.scale-150.png b/res/appstore/Images/Square150x150Logo.scale-150.png new file mode 100644 index 00000000..174f9ae0 Binary files /dev/null and b/res/appstore/Images/Square150x150Logo.scale-150.png differ diff --git a/res/appstore/Images/Square150x150Logo.scale-200.png b/res/appstore/Images/Square150x150Logo.scale-200.png new file mode 100644 index 00000000..c94d1e77 Binary files /dev/null and b/res/appstore/Images/Square150x150Logo.scale-200.png differ diff --git a/res/appstore/Images/Square150x150Logo.scale-400.png b/res/appstore/Images/Square150x150Logo.scale-400.png new file mode 100644 index 00000000..fe1c4b7d Binary files /dev/null and b/res/appstore/Images/Square150x150Logo.scale-400.png differ diff --git a/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png new file mode 100644 index 00000000..da9508c6 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png differ diff --git a/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png new file mode 100644 index 00000000..7132d451 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png differ diff --git a/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png new file mode 100644 index 00000000..5d51c914 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png differ diff --git a/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png new file mode 100644 index 00000000..25524219 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png differ diff --git a/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png new file mode 100644 index 00000000..f4c2fa5c Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png differ diff --git a/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-16.png new file mode 100644 index 00000000..da9508c6 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 00000000..5d51c914 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-32.png new file mode 100644 index 00000000..25524219 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-32.png differ diff --git a/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-48.png new file mode 100644 index 00000000..f4c2fa5c Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/res/appstore/Images/Square44x44Logo.scale-100.png b/res/appstore/Images/Square44x44Logo.scale-100.png new file mode 100644 index 00000000..100719da Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.scale-100.png differ diff --git a/res/appstore/Images/Square44x44Logo.scale-125.png b/res/appstore/Images/Square44x44Logo.scale-125.png new file mode 100644 index 00000000..ace76dc2 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.scale-125.png differ diff --git a/res/appstore/Images/Square44x44Logo.scale-150.png b/res/appstore/Images/Square44x44Logo.scale-150.png new file mode 100644 index 00000000..2f67b471 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.scale-150.png differ diff --git a/res/appstore/Images/Square44x44Logo.scale-200.png b/res/appstore/Images/Square44x44Logo.scale-200.png new file mode 100644 index 00000000..df1b9adf Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.scale-200.png differ diff --git a/res/appstore/Images/Square44x44Logo.scale-400.png b/res/appstore/Images/Square44x44Logo.scale-400.png new file mode 100644 index 00000000..35be71c0 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.scale-400.png differ diff --git a/res/appstore/Images/Square44x44Logo.targetsize-16.png b/res/appstore/Images/Square44x44Logo.targetsize-16.png new file mode 100644 index 00000000..84b368ce Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.targetsize-16.png differ diff --git a/res/appstore/Images/Square44x44Logo.targetsize-24.png b/res/appstore/Images/Square44x44Logo.targetsize-24.png new file mode 100644 index 00000000..3d48781b Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.targetsize-24.png differ diff --git a/res/appstore/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/res/appstore/Images/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 00000000..b8b65cc2 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/res/appstore/Images/Square44x44Logo.targetsize-256.png b/res/appstore/Images/Square44x44Logo.targetsize-256.png new file mode 100644 index 00000000..43c0c127 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.targetsize-256.png differ diff --git a/res/appstore/Images/Square44x44Logo.targetsize-32.png b/res/appstore/Images/Square44x44Logo.targetsize-32.png new file mode 100644 index 00000000..ee6d2ba2 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.targetsize-32.png differ diff --git a/res/appstore/Images/Square44x44Logo.targetsize-48.png b/res/appstore/Images/Square44x44Logo.targetsize-48.png new file mode 100644 index 00000000..68528551 Binary files /dev/null and b/res/appstore/Images/Square44x44Logo.targetsize-48.png differ diff --git a/res/appstore/Images/StoreLogo.scale-100.png b/res/appstore/Images/StoreLogo.scale-100.png new file mode 100644 index 00000000..e75e37c8 Binary files /dev/null and b/res/appstore/Images/StoreLogo.scale-100.png differ diff --git a/res/appstore/Images/StoreLogo.scale-125.png b/res/appstore/Images/StoreLogo.scale-125.png new file mode 100644 index 00000000..7ad1b367 Binary files /dev/null and b/res/appstore/Images/StoreLogo.scale-125.png differ diff --git a/res/appstore/Images/StoreLogo.scale-150.png b/res/appstore/Images/StoreLogo.scale-150.png new file mode 100644 index 00000000..987fbaa6 Binary files /dev/null and b/res/appstore/Images/StoreLogo.scale-150.png differ diff --git a/res/appstore/Images/StoreLogo.scale-200.png b/res/appstore/Images/StoreLogo.scale-200.png new file mode 100644 index 00000000..aa2027cb Binary files /dev/null and b/res/appstore/Images/StoreLogo.scale-200.png differ diff --git a/res/appstore/Images/StoreLogo.scale-400.png b/res/appstore/Images/StoreLogo.scale-400.png new file mode 100644 index 00000000..378bd390 Binary files /dev/null and b/res/appstore/Images/StoreLogo.scale-400.png differ diff --git a/res/appstore/Images/Wide310x150Logo.scale-100.png b/res/appstore/Images/Wide310x150Logo.scale-100.png new file mode 100644 index 00000000..56df0abb Binary files /dev/null and b/res/appstore/Images/Wide310x150Logo.scale-100.png differ diff --git a/res/appstore/Images/Wide310x150Logo.scale-125.png b/res/appstore/Images/Wide310x150Logo.scale-125.png new file mode 100644 index 00000000..ec95f3bd Binary files /dev/null and b/res/appstore/Images/Wide310x150Logo.scale-125.png differ diff --git a/res/appstore/Images/Wide310x150Logo.scale-150.png b/res/appstore/Images/Wide310x150Logo.scale-150.png new file mode 100644 index 00000000..b73b9b9f Binary files /dev/null and b/res/appstore/Images/Wide310x150Logo.scale-150.png differ diff --git a/res/appstore/Images/Wide310x150Logo.scale-200.png b/res/appstore/Images/Wide310x150Logo.scale-200.png new file mode 100644 index 00000000..777642e8 Binary files /dev/null and b/res/appstore/Images/Wide310x150Logo.scale-200.png differ diff --git a/res/appstore/Images/Wide310x150Logo.scale-400.png b/res/appstore/Images/Wide310x150Logo.scale-400.png new file mode 100644 index 00000000..b2f2786d Binary files /dev/null and b/res/appstore/Images/Wide310x150Logo.scale-400.png differ diff --git a/res/appstore/RufusAppxManifest.xml b/res/appstore/RufusAppxManifest.xml new file mode 100644 index 00000000..4a55a70b --- /dev/null +++ b/res/appstore/RufusAppxManifest.xml @@ -0,0 +1,102 @@ + + + + + Rufus + Akeo Consulting + Images\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UTF-8 + + + + + + + + \ No newline at end of file diff --git a/res/appstore/ScaleAppxManifest.xml b/res/appstore/ScaleAppxManifest.xml new file mode 100644 index 00000000..d4251eda --- /dev/null +++ b/res/appstore/ScaleAppxManifest.xml @@ -0,0 +1,26 @@ + + + + + true + Rufus + Akeo Consulting + Images\StoreLogo.png + + + + + + + + diff --git a/res/appstore/gen_listing.ps1 b/res/appstore/gen_listing.ps1 new file mode 100644 index 00000000..e2cb5e1d --- /dev/null +++ b/res/appstore/gen_listing.ps1 @@ -0,0 +1,153 @@ +# PowerShell script to parse rufus.loc and create a listing.csv +# Copyright © 2023 Pete Batard +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +try { + [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 +} catch {} + +function InsertMsg([object]$translated_msgs, [string]$lang, [string]$msg_id, [string]$msg) +{ + for ($i = 0; $i -lt $translated_msgs.MSG_ID.Count; $i++) { + if ($translated_msgs.MSG_ID[$i] -eq $msg_id) { + $translated_msgs.$lang[$i] = $msg + } + } +} + +function GetMsg([object]$translated_msgs, [string]$lang, [string]$msg_id) +{ + for ($i = 0; $i -lt $translated_msgs.MSG_ID.Count; $i++) { + if ($translated_msgs.MSG_ID[$i] -eq $msg_id) { + if ($msg_id -eq "MSG_901" -or $msg_id -eq "MSG_902" -or $msg_id -eq "MSG_903") { + if (-not $translated_msgs.$lang[$i]) { + return $translated_msgs."en-us"[$i] + } + } + return $translated_msgs.$lang[$i] + } + } + return "" +} + +$csv = Import-Csv -Path .\listing_template.csv -Encoding UTF8 + +# Get the translated MSG_ID's we need +$translated_msg_ids = @() +$empty = @() +foreach($row in $csv) { + # There may be multiple MSG_ID's in the row + Select-String "MSG_\d+" -input $row -AllMatches | foreach { + foreach ($match in $_.matches) { + $translated_msg_ids += $match.Value + $empty += "" + } + } +} + +$translated_msgs = New-Object PSObject +Add-Member -InputObject $translated_msgs -NotePropertyName MSG_ID -NotePropertyValue $translated_msg_ids + +$lang = "" +$langs = @() +foreach ($line in Get-Content ..\loc\rufus.loc) { + # Get the language for the current section + if ($line -Like "l *") { + $lang = $line.split(" ",[System.StringSplitOptions]::RemoveEmptyEntries)[1].Trim('"').ToLower() + if ($lang -eq "sr-rs") { + $lang = "sr-latn-rs" + } + $langs += $lang + Add-Member -InputObject $translated_msgs -NotePropertyName $lang -NotePropertyValue $empty.PsObject.Copy() + } + # Add translated messages to our array + if ($line -Like "t MSG_*") { + $msg_id = $line.Substring(2, 7) + if ($translated_msg_ids.Contains($msg_id)) { + $msg = $line.Substring(10).Trim('"').Replace("\n","`n").Replace('\"','"') + # Insert URLs in the relevant messages + if ($msg.Contains("%s")) { + $url = switch ($msg_id) { + MSG_901 { "https://rufus.ie" } + MSG_902 { "https://github.com/pbatard/rufus" } + MSG_903 { "https://github.com/pbatard/rufus/blob/master/ChangeLog.txt" } + } + $msg = $msg.Replace("%s", $url) + } + InsertMsg $translated_msgs $lang $msg_id "$msg" + } + } +} + +# Add the extra columns to our CSV +foreach ($lang in $langs) { + $csv = $csv | Select-Object *, @{ n = $lang; e = " " } +} + +# Now insert the translated strings and whatnot +foreach($row in $csv) { + Select-String "MSG_\d+" -input $row -AllMatches | foreach { + foreach ($lang in $langs) { + $row.$lang = $row.default + foreach ($match in $_.matches) { + $msg = GetMsg $translated_msgs $lang $match.Value + $row.$lang = $row.$lang.Replace($match.Value, $msg) + } + } + # Override some defaults + if ($row.default -eq "MSG_904") { + $row.default = "https://www.gnu.org/licenses/gpl-3.0.html" + } elseif ($row.default -eq "MSG_905") { + $row.default = "Boot" + } else { + $row.default = "" + } + } + if ($row.default -like "") { + # Insert current year into CopyrightTrademarkInformation + if ($row.Field -eq "CopyrightTrademarkInformation") { + $year = Get-Date -Format "yyyy" + $row.default = "© 2011-" + $year + " Pete Batard" + } elseif ($row.Field -eq "ReleaseNotes") { + $section = 0 + $row.default = "" + foreach ($line in Get-Content ..\..\ChangeLog.txt) { + if ($line.StartsWith("o Version")) { + $section++ + continue + } + if ($section -eq 1 -and $line) { + if ($row.default) { + $row.default += "`n" + } + $row.default += $line.Replace(" ", "• ") + } + } + } elseif ($row.Field.StartsWith("DesktopScreenshot")) { + # NB: Per https://learn.microsoft.com/en-us/windows/apps/publish/publish-your-app/import-and-export-store-listings?pivots=store-installer-msix#update-listing-info + # you need to use slashes rather than backslashes and include the name of the folder to upload as part of the path. + $row.default = "" + foreach ($lang in $langs) { + $path = "listing/" + $lang + "/" + $row.Field.Replace("Desktop", "") + ".png" + if (Test-Path -Path $path) { + $row.$lang = $path + } + } + } + } +} + +$csv | Export-Csv 'listing\listing.csv' -NoTypeInformation -Encoding UTF8 diff --git a/res/appstore/listing/ar-sa/Screenshot1.png b/res/appstore/listing/ar-sa/Screenshot1.png new file mode 100644 index 00000000..fbe935ea Binary files /dev/null and b/res/appstore/listing/ar-sa/Screenshot1.png differ diff --git a/res/appstore/listing/bg-bg/Screenshot1.png b/res/appstore/listing/bg-bg/Screenshot1.png new file mode 100644 index 00000000..b5c5a894 Binary files /dev/null and b/res/appstore/listing/bg-bg/Screenshot1.png differ diff --git a/res/appstore/listing/cs-cz/Screenshot1.png b/res/appstore/listing/cs-cz/Screenshot1.png new file mode 100644 index 00000000..e5827ec4 Binary files /dev/null and b/res/appstore/listing/cs-cz/Screenshot1.png differ diff --git a/res/appstore/listing/da-dk/Screenshot1.png b/res/appstore/listing/da-dk/Screenshot1.png new file mode 100644 index 00000000..53f50116 Binary files /dev/null and b/res/appstore/listing/da-dk/Screenshot1.png differ diff --git a/res/appstore/listing/de-de/Screenshot1.png b/res/appstore/listing/de-de/Screenshot1.png new file mode 100644 index 00000000..7244e577 Binary files /dev/null and b/res/appstore/listing/de-de/Screenshot1.png differ diff --git a/res/appstore/listing/el-gr/Screenshot1.png b/res/appstore/listing/el-gr/Screenshot1.png new file mode 100644 index 00000000..3bfa22cc Binary files /dev/null and b/res/appstore/listing/el-gr/Screenshot1.png differ diff --git a/res/appstore/listing/en-us/Screenshot1.png b/res/appstore/listing/en-us/Screenshot1.png new file mode 100644 index 00000000..5e8c32aa Binary files /dev/null and b/res/appstore/listing/en-us/Screenshot1.png differ diff --git a/res/appstore/listing/en-us/Screenshot2.png b/res/appstore/listing/en-us/Screenshot2.png new file mode 100644 index 00000000..8af46b4b Binary files /dev/null and b/res/appstore/listing/en-us/Screenshot2.png differ diff --git a/res/appstore/listing/en-us/Screenshot3.png b/res/appstore/listing/en-us/Screenshot3.png new file mode 100644 index 00000000..1f6aae95 Binary files /dev/null and b/res/appstore/listing/en-us/Screenshot3.png differ diff --git a/res/appstore/listing/en-us/Screenshot4.png b/res/appstore/listing/en-us/Screenshot4.png new file mode 100644 index 00000000..3943f069 Binary files /dev/null and b/res/appstore/listing/en-us/Screenshot4.png differ diff --git a/res/appstore/listing/es-es/Screenshot1.png b/res/appstore/listing/es-es/Screenshot1.png new file mode 100644 index 00000000..c8b81816 Binary files /dev/null and b/res/appstore/listing/es-es/Screenshot1.png differ diff --git a/res/appstore/listing/fa-ir/Screenshot1.png b/res/appstore/listing/fa-ir/Screenshot1.png new file mode 100644 index 00000000..ce9412a4 Binary files /dev/null and b/res/appstore/listing/fa-ir/Screenshot1.png differ diff --git a/res/appstore/listing/fi-fi/Screenshot1.png b/res/appstore/listing/fi-fi/Screenshot1.png new file mode 100644 index 00000000..9a33d81b Binary files /dev/null and b/res/appstore/listing/fi-fi/Screenshot1.png differ diff --git a/res/appstore/listing/fr-fr/Screenshot1.png b/res/appstore/listing/fr-fr/Screenshot1.png new file mode 100644 index 00000000..2a76e70e Binary files /dev/null and b/res/appstore/listing/fr-fr/Screenshot1.png differ diff --git a/res/appstore/listing/he-il/Screenshot1.png b/res/appstore/listing/he-il/Screenshot1.png new file mode 100644 index 00000000..9bc4985c Binary files /dev/null and b/res/appstore/listing/he-il/Screenshot1.png differ diff --git a/res/appstore/listing/hr-hr/Screenshot1.png b/res/appstore/listing/hr-hr/Screenshot1.png new file mode 100644 index 00000000..0900f523 Binary files /dev/null and b/res/appstore/listing/hr-hr/Screenshot1.png differ diff --git a/res/appstore/listing/hu-hu/Screenshot1.png b/res/appstore/listing/hu-hu/Screenshot1.png new file mode 100644 index 00000000..ee9b2ce3 Binary files /dev/null and b/res/appstore/listing/hu-hu/Screenshot1.png differ diff --git a/res/appstore/listing/id-id/Screenshot1.png b/res/appstore/listing/id-id/Screenshot1.png new file mode 100644 index 00000000..e29e28d3 Binary files /dev/null and b/res/appstore/listing/id-id/Screenshot1.png differ diff --git a/res/appstore/listing/it-it/Screenshot1.png b/res/appstore/listing/it-it/Screenshot1.png new file mode 100644 index 00000000..ef578b1d Binary files /dev/null and b/res/appstore/listing/it-it/Screenshot1.png differ diff --git a/res/appstore/listing/ja-jp/Screenshot1.png b/res/appstore/listing/ja-jp/Screenshot1.png new file mode 100644 index 00000000..484969fa Binary files /dev/null and b/res/appstore/listing/ja-jp/Screenshot1.png differ diff --git a/res/appstore/listing/ko-kr/Screenshot1.png b/res/appstore/listing/ko-kr/Screenshot1.png new file mode 100644 index 00000000..7e83c709 Binary files /dev/null and b/res/appstore/listing/ko-kr/Screenshot1.png differ diff --git a/res/appstore/listing/listing.csv b/res/appstore/listing/listing.csv new file mode 100644 index 00000000..6df2d8c7 --- /dev/null +++ b/res/appstore/listing/listing.csv @@ -0,0 +1,361 @@ +"Field","ID","Type (Type)","default","en-us","ar-sa","bg-bg","zh-cn","zh-tw","hr-hr","cs-cz","da-dk","nl-nl","fi-fi","fr-fr","de-de","el-gr","he-il","hu-hu","id-id","it-it","ja-jp","ko-kr","lv-lv","lt-lt","ms-my","nb-no","fa-ir","pl-pl","pt-br","pt-pt","ro-ro","ru-ru","sr-latn-rs","sk-sk","sl-si","es-es","sv-se","th-th","tr-tr","uk-ua","vi-vn" +"Description","2","Text","","Rufus is a utility that helps format and create bootable USB flash drives, such as USB keys/pendrives, memory sticks, etc. +• Official site: https://rufus.ie +• Source Code: https://github.com/pbatard/rufus +• ChangeLog: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","برنامج Rufus هو أداة تساعد في تنسيق وإنشاء أقراص الإقلاع USB، مثل مفاتيح USB، بطاقات الذاكرة، وغيرها. +• الموقع الرسمي: https://rufus.ie +• كود المصدر: https://github.com/pbatard/rufus +• سجل التغييرات: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus е програма, с която можете лесно да форматирате и създавате стартиращи USB устройства, карти с памет и др. +• Официален сайт: https://rufus.ie +• Изходен код: https://github.com/pbatard/rufus +• Лог на промените: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus 是一个帮助您格式化并创建可启动 USB 驱动器(如 U 盘和存储卡)的工具。 +• 官方网站: https://rufus.ie +• 源代码: https://github.com/pbatard/rufus +• 更新日志: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus 是個能格式化並製作可開機 USB 快閃磁碟機(USB 隨身碟、Memory Stick 等等)的工具。 +• 官方網站: https://rufus.ie +• 源始碼: https://github.com/pbatard/rufus +• 更新日誌: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus je aplikacija koja olakšava formatiranje i stvaranje USB pokretačkih jedinica. +• Službena stranica: https://rufus.ie +• Šifra izvora: https://github.com/pbatard/rufus +• ChangeLog: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus je nástroj, který pomáhá formátovat a vytvářet bootovací USB flash disky, jako jsou USB klíče, paměťové karty atd. +• Oficiální stránky: https://rufus.ie +• Zdrojový kód: https://github.com/pbatard/rufus +• Protokol změn: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus er et værktøj, der hjælper med at formatere og skabe startbare USB-flashdrev, såsom USB-nøgler/USB-pinde, USB-stik, osv. +• Officiel side: https://rufus.ie +• Kildekode: https://github.com/pbatard/rufus +• Ændrings log: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus is een programma dat helpt bij het formatteren en aanmaken van opstartbare USB-flash-drives, zoals USB-sticks, geheugensticks, enz. +• Officiële site: https://rufus.ie +• Broncode: https://github.com/pbatard/rufus +• Wijzigingslog: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus on ohjelma, joka auttaa alustamaan ja luomaan boottaavia USB-laitteita, kuten esimerkiksi USB-avaimia, muistitikkuja jne. +• Virallinen sivusto: https://rufus.ie +• Lähdekoodi: https://github.com/pbatard/rufus +• Muutosloki: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus est un utilitaire permettant de formater et de créer des média USB amorçables, tels que clés USB, mémoire flash, etc. +• Site officiel : https://rufus.ie +• Code source: https://github.com/pbatard/rufus +• ChangeLog: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus ist ein Werkzeug, welches dabei hilft, bootfähige USB-Laufwerke zu erstellen, wie beispielweise USB-Keys, Speichersticks usw. +• Offizielle Website: https://rufus.ie +• Quellcode: https://github.com/pbatard/rufus +• Änderungsprotokoll: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Το Rufus είναι ένα βοηθητικό πρόγραμμα που βοηθά στη διαμόρφωση και τη δημιουργία μονάδων flash USB με δυνατότητα εκκίνησης, όπως κλειδιά USB/pendrives,κάρτες μνήμης κ.λπ. +• Επίσημος ιστότοπος: https://rufus.ie +• Πηγαίος κώδικας: https://github.com/pbatard/rufus +• Αρχείο καταγραφής αλλαγών: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus הוא כלי המסייע באתחול ויצירת כונני הבזק מסוג USB הניתנים לאתחול, כמו דיסק און קי, כרטיסי זיכרון וכו׳. +• האתר הרשמי: https://rufus.ie +• קוד מקור: https://github.com/pbatard/rufus +• הערות שחרור: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","A Rufus egy segédprogram, amellyel bootolható USB flash meghajtókat formázhat és készíthet, például USB kulcsokat/pendrive-okat, memóriakártyákat, stb. +• Hivatalos oldal: https://rufus.ie +• Forráskód: https://github.com/pbatard/rufus +• Változási napló: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus adalah alat yang membantu untuk memformat dan membuat perangkat USB flash menjadi bootable, seperti USB flashdisk, kartu memori, dll. +• Situs resmi: https://rufus.ie +• Kode Sumber: https://github.com/pbatard/rufus +• Catatan pergantian: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus è un programma che ti aiuta a formattare e creare una unità flash USB avviabile, come una unità USB, memory stick, ecc. +• Sito ufficiale: https://rufus.ie +• Codice sorgente: https://github.com/pbatard/rufus +• Novità: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus (ルーファス) とは、起動可能なUSBフラッシュドライブ(USBメモリなど)を作成したり、フォーマットをするためのソフトウェアです。 +• 公式サイト: https://rufus.ie +• ソースコード: https://github.com/pbatard/rufus +• 変更履歴: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus는 USB 메모리 및 플래시 드라이브를 포맷하고 부팅할 수 있도록 만드는 도구입니다. +• 공식 사이트: https://rufus.ie +• 소스 코드: https://github.com/pbatard/rufus +• 변경 사항: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus ir instruments ar kura palīdzību var formatēt un izveidot USB ielādes ierīces uz tādiem nesējiem, kā USB pieslēguma zibatmiņas, atmiņas kartes u.c. +• Oficiālā mājas lapa: https://rufus.ie +• Sākotnējais kods: https://github.com/pbatard/rufus +• Izmaiņas: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus programa leidžia suženklinti ir sukurti sistemų paleidimo laikmenas, kaip pvz. USB atmintukus, atminties korteles ir pan. +• Oficiali svetainė: https://rufus.ie +• Šaltinio kodas: https://github.com/pbatard/rufus +• Pakeitimų žurnalas: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus adalah utiliti yang membantu memformat dan mencipta pemacu kilat USB boot, seperti pemacu pen/kekunci USB, kayu memori, dan lain-lain. +• Laman rasmi: https://rufus.ie +• Kod Sumber: https://github.com/pbatard/rufus +• ChangeLog: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus er et verktøy som hjelper til med å formatere og lage oppstartbare USB-stasjoner, for eksempel USB-minnepinner, USB-harddisker, og lignende. +• Offisiell webside: https://rufus.ie +• Kildekode: https://github.com/pbatard/rufus +• Endringslogg: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus ابزاری است که به فرمت و ایجاد درایوهای فلش USB قابل بوت، مانند کلیدهای USB/pendrives، مموری استیک ها و غیره به شما کمک می کند. +• سایت رسمی: https://rufus.ie +• منبع کد: https://github.com/pbatard/rufus +• لیست تغییرات https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus to narzędzie, które pomaga formatować i tworzyć bootowalne dyski flash USB, takie jak klucze USB / pendrive, pendrive'y itp. +• Oficjalna strona: https://rufus.ie +• Kod źródłowy: https://github.com/pbatard/rufus +• Zmiany: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus é um utilitário que ajuda a formatar e a criar unidades flash USB inicializáveis, tais como pendrives USB, cartões de memória, etc. +• Site oficial: https://rufus.ie +• Código fonte: https://github.com/pbatard/rufus +• Registro de alterações: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus é um utilitário que ajuda a formatar e a criar unidades USB inicializáveis, tais como dispositivos USB/pendrives, cartões de memória, etc. +• Site oficial: https://rufus.ie +• Código fonte: https://github.com/pbatard/rufus +• Alterações: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus este un utilitar care ajută la formatarea și crearea de drive-uri USB bootabile, precum cheile sau pendriverele USB, unități de memorie, etc. +• Site official: https://rufus.ie +• Codul Sursei: https://github.com/pbatard/rufus +• Listă de schimbări: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus - это утилита для форматирования и создания загрузочных флеш-накопителей USB. +• Официальный сайт: https://rufus.ie +• Исходный код: https://github.com/pbatard/rufus +• Изменения: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus je uslužni program koji pomaže u formatiranju i kreiranju USB fleš diskova koji se mogu pokretati, kao što su USB ključevi, memorijski štapići itd. +• Zvaničan sajt: https://rufus.ie +• Izvorni kod: https://github.com/pbatard/rufus +• Evidencija promena: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus je utilita, ktorá vám pomôže naformátovať a vytvoriť bootovacie jednotky USB Flash, ako sú napr. USB kľúče, pamäťové karty, atď. +• Oficiálna stránka: https://rufus.ie +• Zdrojový kód: https://github.com/pbatard/rufus +• Zoznam zmien: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus je program za formatiranje in ustvarjanje zagonskih naprav USB. +• Uradna stran: https://rufus.ie +• Šifra vira: https://github.com/pbatard/rufus +• Spremenitve: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus es una utilidad que le ayuda a formatear y crear dispositivos flash booteables, como «pendrives», tarjetas de memoria, etcétera. +• Sitio oficial https://rufus.ie +• Código fuente https://github.com/pbatard/rufus +• Registro de cambios https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus är ett program som hjälper dig formatera och skapa startbara USB-diskar, så som USB-minnen, minneskort, etc. +• Officiell webbplats: https://rufus.ie +• Källkod: https://github.com/pbatard/rufus +• Ändringslogg: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus คือ โปรแกรมที่ช่วยฟอร์แมต และสร้างไดรฟ์บูต USB จาก USB keys, pendrives, memory sticks เป็นต้น +• เว็บไซต์ทางการ: https://rufus.ie +• ซอร์สโค้ด: https://github.com/pbatard/rufus +• บันทึกการเปลี่ยนแปลง: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus, USB anahtar/bellekler, hafıza kartları vb. USB sürücüleri, biçimlendirmeye ve önyüklemeli hale getirmeye yardımcı olan bir araçtır. +• Resmi site: https://rufus.ie +• Kaynak Kodu: https://github.com/pbatard/rufus +• Sürüm Notları https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus це утиліта, яка допомагає форматувати та створювати завантажувальні флешки, картки пам'яті, тощо. +• Офіційний сайт: https://rufus.ie +• Сирцевий код: https://github.com/pbatard/rufus +• Список змін: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt","Rufus là một tiện ích giúp định dạng và tạo khả năng khởi động cho USB, chẳng hạn như thẻ USB/đĩa di động, thẻ nhớ, vv. +• Trang web chính thức: https://rufus.ie +• Mã nguồn: https://github.com/pbatard/rufus +• Nhật ký thay đổi: https://github.com/pbatard/rufus/blob/master/ChangeLog.txt" +"ReleaseNotes","3","Text","• Add new advanced option to perform runtime UEFI media validation of suitable images (Windows, most Linux) +• Move the 'Use Rufus MBR' advanced option to a cheat mode (Alt-A) +• Fix truncation of VHDX images, as well as a benign error message when writing VHD/VHDX +• Fix support for Linux persistence in some configurations (Mint, Ubuntu 24.04) +• Fix multiple potential vulnerabilities (with thanks to Mansour Gashasbi) +• Update internal GRUB to version 2.12 +• Update UEFI:NTFS to latest (now always uses the ntfs-3g driver, rather than the buggy AMI NTFS one) +• Increase buffer size when copying ISO files, in an attempt to minimize the AMI NTFS UEFI driver bug +• Improve partition creation handling +• Don't display the WUE dialog when a conflicting 'unattend.xml' already exists",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Title","4","Text","Rufus",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"ShortTitle","5","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"SortTitle","6","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"VoiceTitle","7","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"ShortDescription","8","Text","","Rufus - The Reliable USB Formatting Utility","Rufus - أداة فرمتة الـ USB جديرة بالثقة","Rufus - Надеждната USB форматираща програма","Rufus - 可靠的 USB 格式化工具","Rufus - 快速可靠的 USB 格式化工具","Rufus - Pouzdan alat za formatiranje USB-a","Rufus - Spolehlivý program pro formátování USB","Rufus - Det pålidelige USB-formateringsværktøj","Rufus - de betrouwbare USB-formatteertool","Rufus - Luotettava USB-alustusohjelma","Rufus - L'utilitaire de formatage USB fiable","Rufus - Das zuverlässige USB-Formatierungstool","Rufus - Μία αξιόπιστη εφαρμογή διαμόρφωσης USB","Rufus - הכלי לאתחול USB האמין ביותר","Rufus - A megbízható USB-formázó segédprogram","Rufus - Utilitas Pemformatan USB yang Handal","Rufus - Utility affidabile per la formattazione di unità USB","Rufus - 信頼性の高い USB フォーマット ユーティリティ","Rufus - 신뢰할 수 있는 USB 포맷 유틸리티","Rufus - uzticama un vienkārša USB formatēšanas utilīta","Rufus - patikima USB formatavimo priemonė","Rufus - Utiliti pemformatan USB yang dipercayai","Rufus - Det pålitelige USB-formateringsprogrammet","Rufus، ابزاری کاربردی و قابل‌اطمینان برای فرمت کردن درایوهای USB","Rufus - niezawodne narzędzie do formatowania USB","Rufus - O Utilitário de Formatação USB Confiável","Rufus - O utilitário de confiança para formatação USB","Rufus - Instrumentul de încredere pentru formatări USB","Rufus - Надёжная утилита для форматирования USB-дисков","Rufus - Pouzdan Alat Za Formatiranje USB diska","Rufus - Spoľahlivý program pre formátovanie USB","Rufus - zanesljivi pripomoček za USB formatiranje","Rufus, la herramienta de formateo de USBs en la que puedes confiar","Rufus - Det pålitliga verktyget för USB-formatering","Rufus - ยูทิลิตี้การฟอร์แมต USB ที่ไว้ใจได้","Rufus - Güvenilir USB Biçimlendirme Programı","Rufus - надійна утиліта для форматування USB-накопичувачів","Rufus - Tiện ích Định dạng USB Đáng tin cậy" +"DevStudio","9","Text","Pete Batard",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"CopyrightTrademarkInformation","12","Text","© 2011-2024 Pete Batard",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"AdditionalLicenseTerms","13","Text","https://www.gnu.org/licenses/gpl-3.0.html","This application is licensed under the terms of the GNU Public License (GPL) version 3. +See https://www.gnu.org/licenses/gpl-3.0.en.html for details.","هذا التطبيق مُرخص بموجب شروط رخصة جنو (GNU) العمومية (GPL) الإصدار 3. +راجع https://www.gnu.org/licenses/gpl-3.0.ar.html لمزيد من التفاصيل.","Тази програма е лицензирана според условията на GNU Public License (GPL) версия 3. +Вижте https://www.gnu.org/licenses/gpl-3.0.html за подробности.","本应用采用 GNU 通用公共许可证 (GPL) 第三版。 +具体许可证见 https://www.gnu.org/licenses/gpl-3.0.zh-cn.html。","本應用採用 GNU 通用公共許可證 (GPL) 第三版。 +具體許可證見 https://www.gnu.org/licenses/gpl-3.0.zh-tw.html。","Ova je aplikacija licencirana pod uvjetima GNU Javne licence (GPL) verzije 3. +Detalje potražite u https://www.gnu.org/licenses/gpl-3.0.html.","Tato aplikace je licencována podle podmínek GNU Public License (GPL) verze 3. +Podrobnosti naleznete na adrese https://www.gnu.org/licenses/gpl-3.0.html.","Denne application er licenceret under GNU Public License (GPL) version 3's vilkår. +Se https://www.gnu.org/licenses/gpl-3.0.html for detaljer.","Deze toepassing valt onder de voorwaarden van de GNU Public License (GPL) versie 3. +Zie https://www.gnu.org/licenses/gpl-3.0.nl.html voor details.","Tämä sovellus on lisensoitu GNU Public License (GPL) version 3 ehtojen mukaisesti. +Lisätietoja osoitteessa https://www.gnu.org/licenses/gpl-3.0.html (englanniksi).","Cette application est fournie sous les termes de la Licence publique générale GNU (GPL) version 3. +Veuillez consulter https://www.gnu.org/licenses/gpl-3.0.fr.html pour plus de details.","Diese Anwendung ist unter den Bedingungen der GNU Public License (GPL) Version 3 lizenziert. +Siehe https://www.gnu.org/licenses/gpl-3.0.de.html für Details.","Αυτή η εφαρμογή έχει άδεια χρήσης σύμφωνα με τους όρους της GNU Public License (GPL) έκδοση 3. +Δείτε https://www.gnu.org/licenses/gpl-3.0.html για λεπτομέρειες.","יישום זה ברישיון תחת התנאים של גרסה 3 של הרישיון הציבורי של גנו (GPL). +לפרטים נוספים, יש להיכנס אל https://www.gnu.org/licenses/gpl-3.0.html.","Ezen alkalmazás használata a GNU Public License (GPL) 3-as verzió feltételei szerint engedélyezett. +További információ: https://www.gnu.org/licenses/gpl-3.0.html.","Aplikasi ini dilisensikan di bawah ketentuan GNU Public License (GPL) versi 3. +Lihat https://www.gnu.org/licenses/gpl-3.0.html untuk detail lebih lanjut.","Questa applicazione è rilasciata sotto i termini della GNU Public License (GPL) versione 3. +Vedere https://www.gnu.org/licenses/gpl-3.0.html per dettagli.","このアプリケーションはGNU Public License (GPL) version 3でライセンスされています。 +詳細は https://www.gnu.org/licenses/gpl-3.0.ja.html をご覧ください。","이 응용 프로그램은 GNU Public License (GPL) 버전 3의 조건에 따라 라이선스가 부여됩니다. +자세한 내용은 https://www.gnu.org/licenses/gpl-3.0.html 을 참조하십시오.","Šai programmai ir licences noteikumi, kā GNU Public License (GPL) version 3. +Papildinformācijai skatīt https://www.gnu.org/licenses/gpl-3.0.html.","Ši programa yra licencijuota pagal GNU viešosios licencijos (GPL) 3 versijos sąlygas. +Daugiau informacijos rasite https://www.gnu.org/licenses/gpl-3.0.html.","Permohonan ini dilesenkan di bawah syarat-syarat Lesen Awam GNU (GPL) versi 3. +Lihat https://www.gnu.org/licenses/gpl-3.0.html untuk butiran.","Dette programmet er lisensiert under GNU Public Licence (GPL) versjon 3. +Se https://www.gnu.org/licenses/gpl-3.0.html for mer informasjon.","این برنامه تحت شرایط مجوز عمومی گنو (GPL) نسخه 3 مجوز دارد. +برای جزئیات به https://www.gnu.org/licenses/gpl-3.0.html مراجعه کنید.","Ta aplikacja jest objęta licencją na warunkach licencji publicznej GNU (GPL) w wersji 3. +Z obacz https://www.gnu.org/licenses/gpl-3.0.html, aby uzyskać szczegółowe informacje.","Este software está licenciado sob os termos da GNU Public License (GPL) versão 3. +Consulte https://www.gnu.org/licenses/gpl-3.0.pt-br.html para mais detalhes.","Este software está licenciado sob os termos da GNU Public License (GPL) versão 3. +Consulte https://www.gnu.org/licenses/gpl-3.0.html para mais detalhes.","Această aplicație este sub liciența și termenii și condițiile ale lui GNU Public License (GPL) versiunea a 3-a. +Vazi https://www.gnu.org/licenses/gpl-3.0.en.html pentru detalii.","Это приложение распространяется по лицензии GNU Public License (GPL) версии 3. +Подробнее см. https://www.gnu.org/licenses/gpl-3.0.ru.html.","Ova aplikacija je licencirana pod uslovima GNU Javne licence (GPL) verzije 3. +Pogledajte https://www.gnu.org/licenses/gpl-3.0.en.html za više informacija.","Táto aplikácia je licencovaná podľa podmienok GNU Public License (GPL) verzia 3. +Podrobnosti nájdete na https://www.gnu.org/licenses/gpl-3.0.html.","Ta aplikacija je licencirana pod pogoji GNU Javne licence (GPL) različice 3. +Oglejte si https://www.gnu.org/licenses/gpl-3.0.html podrobnosti.","Esta aplicación tiene licencia bajo los términos de la Licencia Pública GNU (GPL) versión 3. +Consulte https://www.gnu.org/licenses/gpl-3.0.html para obtener más información.","Denna applikation är licensierad under villkoren i GNU Public License (GPL) version 3. +Se https://www.gnu.org/licenses/gpl-3.0.en.html för mer information.","แอปพลิเคชันนี้ได้รับอนุญาตภายใต้เงื่อนไขของ GNU Public License (GPL) เวอร์ชัน 3 +ดูรายละเอียดได้ที่ https://www.gnu.org/licenses/gpl-3.0.html","Bu uygulama, GNU Kamu Lisansı (GPL) sürüm 3'ün koşulları altında lisanslanmıştır. +Detaylar için https://www.gnu.org/licenses/gpl-3.0.tr.html sayfasını ziyaret edin.","Ця програма ліцензована згідно з умовами GNU Public License (GPL) version 3. +Більше: https://www.gnu.org/licenses/gpl-3.0.uk.html.","Phần mềm này đã được cấp phép dưới các điều khoản của GNU Public License (GPL) phiên bản 3. +Xem tại https://www.gnu.org/licenses/gpl-3.0.html để biết thêm chi tiết." +"DesktopScreenshot1","100","Relative path (or URL to file in Partner Center)","","listing/en-us/Screenshot1.png","listing/ar-sa/Screenshot1.png","listing/bg-bg/Screenshot1.png","listing/zh-cn/Screenshot1.png","listing/zh-tw/Screenshot1.png","listing/hr-hr/Screenshot1.png","listing/cs-cz/Screenshot1.png","listing/da-dk/Screenshot1.png","listing/nl-nl/Screenshot1.png","listing/fi-fi/Screenshot1.png","listing/fr-fr/Screenshot1.png","listing/de-de/Screenshot1.png","listing/el-gr/Screenshot1.png","listing/he-il/Screenshot1.png","listing/hu-hu/Screenshot1.png","listing/id-id/Screenshot1.png","listing/it-it/Screenshot1.png","listing/ja-jp/Screenshot1.png","listing/ko-kr/Screenshot1.png","listing/lv-lv/Screenshot1.png","listing/lt-lt/Screenshot1.png","listing/ms-my/Screenshot1.png","listing/nb-no/Screenshot1.png","listing/fa-ir/Screenshot1.png","listing/pl-pl/Screenshot1.png","listing/pt-br/Screenshot1.png","listing/pt-pt/Screenshot1.png","listing/ro-ro/Screenshot1.png","listing/ru-ru/Screenshot1.png","listing/sr-latn-rs/Screenshot1.png","listing/sk-sk/Screenshot1.png","listing/sl-si/Screenshot1.png","listing/es-es/Screenshot1.png","listing/sv-se/Screenshot1.png","listing/th-th/Screenshot1.png","listing/tr-tr/Screenshot1.png","listing/uk-ua/Screenshot1.png","listing/vi-vn/Screenshot1.png" +"DesktopScreenshot2","101","Relative path (or URL to file in Partner Center)","","listing/en-us/Screenshot2.png",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshot3","102","Relative path (or URL to file in Partner Center)","","listing/en-us/Screenshot3.png",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshot4","103","Relative path (or URL to file in Partner Center)","","listing/en-us/Screenshot4.png",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshot5","104","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshot6","105","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshot7","106","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshot8","107","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshot9","108","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshot10","109","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption1","150","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption2","151","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption3","152","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption4","153","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption5","154","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption6","155","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption7","156","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption8","157","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption9","158","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"DesktopScreenshotCaption10","159","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot1","200","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot2","201","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot3","202","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot4","203","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot5","204","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot6","205","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot7","206","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot8","207","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot9","208","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshot10","209","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption1","250","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption2","251","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption3","252","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption4","253","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption5","254","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption6","255","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption7","256","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption8","257","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption9","258","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MobileScreenshotCaption10","259","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot1","300","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot2","301","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot3","302","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot4","303","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot5","304","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot6","305","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot7","306","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot8","307","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot9","308","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshot10","309","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption1","350","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption2","351","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption3","352","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption4","353","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption5","354","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption6","355","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption7","356","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption8","357","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption9","358","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxScreenshotCaption10","359","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot1","400","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot2","401","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot3","402","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot4","403","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot5","404","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot6","405","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot7","406","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot8","407","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot9","408","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshot10","409","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption1","450","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption2","451","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption3","452","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption4","453","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption5","454","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption6","455","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption7","456","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption8","457","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption9","458","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"HolographicScreenshotCaption10","459","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"StoreLogo720x1080","600","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"StoreLogo1080x1080","601","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"StoreLogo300x300","602","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"OverrideLogosForWin10","603","True/False","FALSE",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"StoreLogoOverride150x150","604","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"StoreLogoOverride71x71","605","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"PromoImage1920x1080","606","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"PromoImage2400x1200","607","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxBrandedKeyArt584x800","608","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxTitledHero1920x1080","609","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"XboxFeaturedPromo1080x1080","610","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"OptionalPromo358x358","611","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"OptionalPromo1000x800","612","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"OptionalPromo414x180","613","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Feature1","700","Text","","Format USB, flash card and virtual drives to FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","تهيئة USB وبطاقة الفلاش ومحركات الأقراص الافتراضية إلى FAT / FAT32 / NTFS / UDF / exFAT / ReFS / ext2 / ext3","Форматиране на USB, карти памет и виртуални устройства с FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","将 U 盘、存储卡或虚拟驱动器格式化为 FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3 格式","將隨身碟、記憶卡或虛擬光碟機格式化為 FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3 格式","Formatirajte USB, flash karticu i virtualne pogone na FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formátování USB, flash karet a virtuálních jednotek na FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formater USB, flash kort og virtuelle drev til FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","USB, flashkaart en virtuele schijven formatteren naar FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Alusta USB-asemia, muistikortteja ja virtuaalisia asemia muotoon FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatez des périphériques USB, des cartes flash et des disques virtuels en FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatieren von USB, Flash-Karte und virtuellen Laufwerken in FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Μορφοποίηση USB, κάρτας flash και εικονικών μονάδων δίσκου σε FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","אתחול USB, כרטיסי זיכרון וכוננים וירטואליים ל־FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","USB, flash memóriakártyák és virtuális meghajtók formázása FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3 fájlrendszerre","Format USB, kartu flash dan penyimpanan maya ke FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatta USB, flash card e unità virtuali in FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","USBメモリやSDカード、仮想ドライブをFAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3でフォーマットします。","USB, 플래시 카드 및 가상 드라이브를 FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3로 포맷","Formatē USB, atmiņas kartes un virtuālos diskus formātos FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Suformatuokite USB, flash kortelę ir virtualius diskus į FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatkan USB, kad flash dan pemacu maya kepada FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formater USB, minnekort og virtuelle disker til FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","فرمت USB، فلش کارت و درایوهای مجازی به FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Sformatuj nośnik używając: FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatar dispositivos USB, cartões flash e discos virtuais com FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatar dispositivos USB, cartão de memória e drives virtuais em FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatează USB, card flash si drive-uri virtuale la FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Форматирование USB, флешек и виртуальных дисков в FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatiraj USB, flash kartice, i virtualne diskove u FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Naformátujte USB, kartu a virtuálne disky do FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatiranje USB, bliskavice in virtualnih pogonov na FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatee USB, tarjetas flash y unidades virtuales a FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Formatera USB-enheter, flash-kort och virtuella enheter till FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","ฟอร์แมต USB, แฟลชการ์ด หรือไดรฟ์เสมือน ให้อยู่ในรูปแบบของ FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","USB, flash kart ve sanal sürücüleri FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3 olarak biçimlendirin","Форматування USB-накопичувачів, флешок, карток пам'яті у FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3","Định dạng USB, thẻ nhớ hoặc ổ nhớ ảo với FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3" +"Feature2","701","Text","","Create FreeDOS bootable USB drives","إنشاء محركات أقراص USB قابلة للإقلاع من FreeDOS","Създаване на FreeDOS стартиращ USB устройства","创建 FreeDOS 可启动驱动器","建立 FreeDOS 可啟隨身碟","Stvaranje FreeDOS USB pogona za pokretanje","Vytvoření bootovacích disků USB se systémem FreeDOS","Lav FreeDOS opstartsbare USB drev","FreeDOS opstartbare USB-schijven aanmaken","Luo boottaavia FreeDOS USB-asemia","Créez des disques amorçable FreeDOS","FreeDOS-bootfähige USB-Laufwerke erstellen","Δημιουργήστε μονάδες USB με δυνατότητα εκκίνησης FreeDOS","יצירת כונני USB הניתנים לאתחול של FreeDOS","Bootolható FreeDOS USB meghajtó készítése","Buat perangkat USB FreeDOS yang dapat di boot","Crea unità USB avviabili FreeDOS","FreeDOSの起動可能ドライブを作成します。","FreeDOS 부팅 가능한 USB 드라이브 만들기","Izveido FreeDOS ielādes USB ierīces","Sukurkite FreeDOS įkrovos USB diskus","Buat pemacu USB boleh boot FreeDOS","Lag FreeDos oppstartbar USB stick","درایوهای USB قابل بوت FreeDOS را ایجاد کنید","Stwórz bootowalny nośnik USB FreeDOS","Criar discos USB inicializáveis FreeDOS","Criar unidades USB inicializáveis FreeDOS","Crează drive USB bootabil FreeDOS","Создание загрузочных USB-дисков FreeDOS","Kreiraj FreeDOS butabilni USB disk","Vytvorte bootovacie usb zariadenia FreeDOS","Ustvarite FreeDOS zagonske USB pogone","Crear unidades USB de arranque FreeDOS","Skapa FreeDOS startbara USB-enheter","สร้าง USB ไดรฟ์บูตสำหรับระบบ FreeDOS","FreeDOS önyüklenebilir USB sürücüleri oluşturun","Створення завантажувальних пристроїв FreeDOS","Tạo USB có thể khởi động với FreeDOS" +"Feature3","702","Text","","Create bootable drives from bootable ISOs (Windows, Linux, etc.)","إنشاء محركات أقراص قابلة للإقلاع من ملفات ISO القابلة للإقلاع (Windows و Linux وما إلى ذلك)","Създаване на стартиращи устройства от ISO образи (Windows, Linux и др.)","从可启动 ISO 文件 (Windows 和 Linux 等) 创建可启动驱动器","從可啟動 ISO 檔案 (Windows 和 Linux 等) 建立可啟動隨身碟","Stvaranje pogona za pokretanje iz ISO-ova za pokretanje (Windows, Linux itd.)","Vytváření bootovacích jednotek ze zaváděcích ISO (Windows, Linux atd.)","Lav opstartsbarer drev fra opstartsbarer ISOer (Window, Linux, osv.)","Opstartbare schijven aanmaken via opstartbare ISO's (Windows, Linux, enz)","Luo käynnistysasemia boottaavista ISO-kuvista (Windows, Linux jne.)","Créez des disques amorçables à partir d'images ISOs (Windows, Linux, etc.)","Erstellen bootfähiger Laufwerke aus bootfähigen ISOs (Windows, Linux, etc.)","Δημιουργήστε εκκινήσιμες μονάδες από ISO με δυνατότητα εκκίνησης (Windows, Linux, κ.λπ.)","יצירת כוננים הניתנים לאתחול מקובצי ISO הניתנים לאתחול (Windows‏, Linux וכו')","Bootolható meghajtók készítése bootolható ISO képfájlokból (Windows, Linux, stb.)","Buat perangkat yang dapat di boot dari ISO (Windows, Linux, dll.)","Crea unità avviabili da ISO avviabili (Windows, Linux, ecc.)","WindowsやLinuxなどのISOファイルから起動可能ドライブを作成します。","부팅 가능한 ISO (Windows, Linux 등)에서 부팅 가능한 드라이브 만들기","Izveido ielādes ierīces no ISO failiem (Windows, Linux, u.c.)","Sukurkite įkrovos diskus iš įkrovos ISO (Windows, Linux ir kt.)","Buat pemacu boleh boot daripada ISO boleh boot (Windows, Linux, dll.)","Lag oppstartabar enhet/disk fra ISOer (Windows, Linux, etc.)","ایجاد درایوهای قابل بوت از ISOهای قابل بوت (ویندوز، لینوکس و غیره)","Twórz dyski rozruchowe z obrazów ISO (Windows, Linux itp.)","Criar discos inicializáveis a partir de ISOs inicializáveis (Windows, Linux, etc.)","Criar unidades inicializáveis a partir de ISOs inicializáveis (Windows, Linux, etc.)","Crează drive-uri bootabile de la ISO-uri bootabile (Windows, Linux, etc.)","Создание загрузочных дисков из загрузочных образов ISO (Windows, Linux и т.д.)","Kreirajte disk jedinice za pokretanje sistema od ISO-a koji se mogu pokretanja sistema (Windows, Linux itd.)","Vytvorte bootovacie jednotky z ISO súborov (Windows, Linux atď.)","Ustvarite zagonske pogone iz zagonskih ISO-jev (Windows, Linux itd.)","Cree unidades de arranque desde ISO de arranque (Windows, Linux, etc.)","Skapa startbara enheter från startbara ISO-filer (Windows, Linux, etc.)","สร้าง USB ไดรฟ์บูตจากไฟล์ ISO ที่บูตได้ (เช่น ไฟล์ติดตั้ง Windows หรือ Linux เป็นต้น)","Önyüklenebilir ISO'lardan önyüklenebilir sürücüler oluşturun (Windows, Linux, vb.)","Створення завантажувальних пристроїв з завантажувальних образів (Windows, Linux, тощо)","Tạo ổ đĩa có thể khởi động từ các file ISO có thể khởi động (Windows, Linux, v.v...)" +"Feature4","703","Text","","Create bootable drives from bootable disk images, including compressed ones","إنشاء محركات أقراص قابلة للإقلاع من صور الأقراص القابلة للإقلاع ، بما في ذلك الأقراص المضغوطة","Създаване на стартиращи устройства от образи, включително компресирани такива","从可启动硬盘镜像 (包括压缩镜像) 创建可启动驱动器","從可啟動硬碟映像檔 (包括壓縮映像檔) 建立可啟動隨身碟","Stvaranje pogona za pokretanje iz slika diska za pokretanje, uključujući komprimirane","Vytváření zaváděcích jednotek ze zaváděcích obrazů disků, včetně komprimovaných","Lav opstartsbarer drev fra opstartsbarer disk billeder, inklusiv komprimerede billeder","Opstartbare schijven aanmaken van opstartbare schijf-images, inclusief gecomprimeerde images","Luo käynnistysasemia boottaavista levykuvista, pakatut kuvat mukaanlukien","Créez des disques amorçables à partir d'images disque, y compris à partir d'images compressées","Erstellen bootfähiger Laufwerke aus bootfähigen Festplatten-Images, einschließlich komprimierter Images","Δημιουργήστε μονάδες εκκίνησης από εικόνες δίσκου με δυνατότητα εκκίνησης, συμπεριλαμβανομένων συμπιεσμένων","יצירת כוננים הניתנים לאתחול מקובצי תמונת דיסק הניתנים לאתחול, כולל קבצים דחוסים","Bootolható meghajtók készítése bootolható lemez képfájlokból, beleértve a tömörítetteket is","Buat perangkat yang dapat di boot dari Disk Image, termasuk yang Disk Image yang terkompresi","Crea unità avviabili da immagini disco avviabili, incluse quelle compresse","圧縮済みのものを含むディスクイメージから起動可能ドライブを作成します。","압축된 이미지를 포함하여 부팅 가능한 디스크 이미지에서 부팅 가능한 드라이브 만들기","Izveido ielādes ierīces no ielādes disku virtuālajiem attēliem, tai skaitā arī no saspiestajiem","Sukurkite įkrovos diskus iš įkrovos disko vaizdų, įskaitant suspaustus","Buat pemacu boleh boot daripada imej cakera boleh boot, termasuk yang dimampatkan","Lag oppstartbare disker fra images, inkludert komprimerte sådan","درایوهای قابل بوت را از تصاویر دیسک قابل بوت، از جمله موارد فشرده، ایجاد کنید","Twórz dyski rozruchowe z obrazów dysków, włączając skompresowane","Criar discos inicializáveis a partir de imagens de disco inicializáveis, inclusive de imagens compactadas","Criar unidades inicializáveis a partir de imagens de disco inicializáveis, inclusive de imagens compactadas","Crează drive-uri de la imagini de disc bootabile, incluzând cele compresate","Создание загрузочных дисков из образов загрузочных дисков, в том числе сжатых","Kreiranje disk jedinica za pokretanje sistema sa slika diska koji se može pokretanja, uključujući kompresovane","Vytvorte bootovacie jednotky z diskových obrazov, vrátane tých komprimovaných","Ustvarite zagonske pogone iz slik diska, ki jih je mogoče zagnati, vključno s stisnjenimi","Cree unidades de arranque a partir de imágenes de disco de arranque, incluidas las comprimidas","Skapa startbara enheter från startbara diskavbildningar, inklusive komprimerade","สร้างไดรฟ์บูตจากดิสก์อิมเมจที่บูตได้ (รองรับไฟล์ดิสก์อิมเมจที่ถูกบีบอัด)","Sıkıştırılmış olanlar da dahil olmak üzere önyüklenebilir disk yansısından önyüklenebilir sürücüler oluşturun","Створення завантажувальних пристроїв з завантажувальних образів, у тому числі стиснутих","Tạo ổ đĩa có thể khởi động từ các tệp đĩa có thể khởi động, bao gồm cả tệp nén" +"Feature5","704","Text","","Create BIOS or UEFI bootable drives, including UEFI bootable NTFS","إنشاء BIOS أو محركات أقراص UEFI قابلة للإقلاع ، بما في ذلك UEFI NTFS القابل للتشغيل","Създаване на BIOS или UEFI стартиращи устройства, включително UEFI стартиращ NTFS","创建 BIOS 或 UEFI 可启动驱动器,包括 UEFI 可启动的 NTFS 驱动器","建立 BIOS 或 UEFI 可啟動隨身碟,包括 UEFI 可啟動的 NTFS 隨身碟","Stvaranje BIOS ili UEFI pogona za pokretanje, uključujući UEFI NTFS za pokretanje","Vytvořte zaváděcí jednotky BIOS nebo UEFI, včetně zaváděcích souborů NTFS UEFI","Lav BIOS eller UEFI opstartsbarer drev, inklusiv UEFI opstartsbarer NTFS","BIOS of UEFI opstartbare schijven aanmaken, inclusief UEFI opstartbare NTFS","Luo BIOS- tai UEFI-boottaavia asemia, mukaanlukien UEFI-boottaavat NTFS-asemat","Créez des disques amorçables BIOS ou UEFI, y compris des disques UEFI amorçables utilisant NTFS","Erstellen von BIOS- oder UEFI-bootfähigen Laufwerken, einschließlich UEFI-bootfähigem NTFS","Δημιουργήστε μονάδες δίσκου με δυνατότητα εκκίνησης BIOS ή UEFI, συμπεριλαμβανομένων NTFS με δυνατότητα εκκίνησης UEFI","יצירת כוננים הניתנים לאתחול ממחשבים התומכים ב־BIOS או UEFI, לרבות כוננים הניתנים לאתחול מ־UEFI, המשתמשים במערכת הקבצים NTFS","BIOS-ból vagy UEFI-ből bootolható meghajtók készítése, beleértve az UEFI-ből bootolható NTFS meghajtókat is","Buat perangkat BIOS atau UEFI yang dapat di boot, termasuk perangkat NTFS yang dapat di boot oleh UEFI","Crea unità avviabili BIOS o UEFI, incluso NTFS avviabile UEFI","UEFI:NTFSを含むBIOS及びUEFIで起動可能なドライブを作成します。","UEFI 부팅 가능한 NTFS를 포함하여 BIOS 또는 UEFI 부팅 가능 드라이브 만들기","Izveido BIOS vai UEFI ielādes ierīces, ieskaitot UEFI ielādi no NTFS","Sukurkite BIOS arba UEFI įkrovos diskus, įskaitant UEFI įkrovos NTFS","Buat pemacu boleh boot BIOS atau UEFI, termasuk NTFS boleh boot UEFI","Lag BIOS eller UEFI oppstartbare disker, inkludert UEFI oppstartbar NTFS","درایوهای قابل بوت بایوس یا UEFI از جمله NTFS قابل بوت UEFI ایجاد کنید","Stwórz dysk rozruchowy BIOS lub UEFI, włączając bootowalny dysk UEFI NTFS","Criar discos inicializáveis ​​BIOS ou UEFI, inclusive discos UEFI inicializáveis ​​usando NTFS","Criar discos inicializáveis ​​BIOS ou UEFI, inclusive discos UEFI inicializáveis ​​usando NTFS","Crează discuri bootabile BIOS sau UEFI, incluzând NTFS-uri bootabile de UEFI","Создание загрузочных дисков BIOS или UEFI, включая загрузочный UEFI NTFS","Kreiranje BIOS ili UEFI disk jedinica za pokretanje sistema, uključujući NTFS sa UEFI pokretanjem sistema","Vytvorte bootovacie jednotky systému BIOS alebo UEFI vrátane UEFI bootovateľnej jednotky NTFS","Ustvarite zagonske pogone BIOS ali UEFI, vključno z UEFI bootable NTFS","Cree unidades de arranque BIOS o UEFI, incluido NTFS de arranque UEFI","Skapa BIOS- eller UEFI-startbara enheter, inklusive UEFI-startbar NTFS","สร้างไดรฟ์บูตสำหรับระบบ BIOS หรือ UEFI และ UEFI bootable NTFS","UEFI önyüklenebilir NTFS dahil BIOS ya da UEFI önyüklenebilir sürücüler oluşturun","Створення завантажувальних пристроїв BIOS чи UEFI, включаючи завантажувальний UEFI NTFS","Tạo ổ đĩa có thể khởi động với hệ thống BIOS hoặc UEFI, bao gồm cả NTFS có thể khởi động với UEFI" +"Feature6","705","Text","","Create 'Windows To Go' drives","إنشاء محركات أقراص ""Windows To Go\","Създаване на 'Windows To Go' устройства","创建 'Windows To Go' 驱动器","建立 'Windows To Go' 隨身碟","Stvaranje pogona ""Windows To Go\","Vytvoření jednotek ""Windows To Go","Lav 'Windows To Go' drev","'Windows To Go'-schijven aanmaken","Luo 'Windows To Go' -asemia","Créez des disques 'Windows To Go'","Erstellen von ""Windows To Go""-Laufwerken","Δημιουργήστε μονάδες δίσκου ""Windows To Go\","יצירת כונני Windows To Go","'Windows To Go' meghajtók készítése","Buat perangkat Windows To Go","Crea unità 'Windows To Go'","Windows To Goドライブを作成します。","'Windows To Go' 드라이브 만들기","Izveido 'Windows To Go' ierīces","Sukurkite ""Windows To Go"" diskus","Buat pemacu 'Windows To Go'","Lag 'Windows To Go' disker","درایوهای ""Windows To Go"" را ایجاد کنید","Stwórz dysk 'Windows To Go'","Criar discos 'Windows To Go'","Criar discos 'Windows To Go'","Crează discuri 'Windows To Go'","Создание дисков Windows To Go","Kreiranje disk jedinica ""Windows to Go\","Vytvorte jednotky „Windows To Go\","Ustvarjanje pogonov »Windows To Go'","Cree unidades 'Windows To Go'","Skapa ""Windows To Go""-enheter","สร้างไดรฟ์ของ 'Windows To Go'","'Windows To Go' sürücüleri oluşturun","Створення пристроїв 'Windows To Go'","Tạo ổ đĩa 'Windows To Go'" +"Feature7","706","Text","","Create Windows 11 installation drives for PCs that don't have TPM or Secure Boot","قم بإنشاء محركات تثبيت ويندوز 11 لأجهزة الكمبيوتر التي لا تحتوي على TPM أو الإقلاع الآمن (Secure Boot)","Създаване на Windows 11 инсталационно устройство за компютри, които нямат TPM или Secure Boot","为没有 TPM 或安全启动功能的电脑创建 Windows 11 安装驱动器","為沒有 TPM 或安全開機功能的電腦建立 Windows 11 安裝隨身碟","Stvaranje instalacijskih pogona sustava Windows 11 za PC-jeve koji nemaju TPM ili Sigurno pokretanje","Vytvoření instalačních jednotek systému Windows 11 pro počítače bez čipu TPM nebo Secure Boot","Lav Windows 11 installations drev for PCer der ikker har TPM eller Secure Boot","Windows 11 installatieschijven aanmaken voor pc's die geen TPM of Secure Boot hebben","Luo Windows 11 -asennusasemia tietokoneille, jotka eivät tue TPM- tai Secure Boot -ominaisuuksia","Créez des disques d'installation Windows 11 pour des PCs qui ne disposent pas de TPM ou Secure Boot","Erstellen von Windows 11-Installationslaufwerken für PCs ohne TPM oder Secure Boot","Δημιουργήστε μονάδες εγκατάστασης των Windows 11 για υπολογιστές που δεν διαθέτουν TPM ή Ασφαλή Εκκίνηση","יצירת כונני התקנה של Windows 11 עבור מחשבים שאין להם TPM או Secure Boot","Windows 11 telepítési meghajtók készítése olyan PC-k számára, amelyek nem rendelkeznek TPM vagy Secure Boot funkciókkal","Buat perangkat pemasang Windows 11 untuk PC yang tidak mempunyai TPM atau Secure Boot","Crea unità di installazione di Windows 11 per PC che non dispongono di TPM o avvio protetto","TPM及びセキュアブート非対応のPC向けのWindows 11インストールドライブを作成します","TPM 또는 보안 부팅이 없는 PC용 Windows 11 설치 드라이브 만들기","Izveido Windows 11 instalācijas ierīces datoriem, kam nav TPM vai Secure Boot","Sukurkite Windows 11 diegimo diskus kompiuteriams, kuriuose nėra TPM arba saugaus įkrovimo","Buat pemacu pemasangan Windows 11 untuk PC yang tidak mempunyai TPM atau But Selamat","Lag oppstartsmedia for Windows 11 som ikke krever TPM eller Secure Boot","درایوهای نصب ویندوز 11 را برای رایانه هایی که TPM یا Secure Boot ندارند ایجاد کنید","Twórz dyski instalacyjne systemu Windows 11 dla komputerów, które nie posiadają modułu TPM ani Secure Boot","Criar discos de instalação do Windows 11 para PCs que não possuem TPM ou Secure Boot","Criar discos de instalação do Windows 11 para PCs que não possuem TPM ou Arranque Seguro","Crează drive de instalare Windows 11 pe computere care nu au TPM sau Bootare Securizată","Создание установочных дисков Windows 11 для компьютеров без TPM или безопасной загрузки","Kreiranje windows 11 instalacionih disk jedinica za računare koji nemaju TPM ili bezbedno pokretanje sistema","Vytvorte inštalačné jednotky Windows 11 pre počítače, ktoré nemajú modul TPM, ani Secure Boot","Ustvarjanje namestitvenih pogonov za Windows 11 za računalnike, ki nimate TPM ali Varnega zagona","Cree unidades de instalación de Windows 11 para PC que no tienen TPM o Arranque seguro","Skapa installationsenheter till Windows 11 för datorer som inte har TPM eller säker start","สร้างไดรฟ์ติดตั้ง Windows 11 สำหรับคอมพิวเตอร์ที่ไม่มี TPM หรือ Secure Boot","TPM ya da Güvenli Önyüklemeye sahip olmayan bilgisayarlar için Windows 11 kurulum sürücüleri oluşturun","Створення інсталяційних дисків Windows 11 для ПК, які не мають TPM чи Secure Boot","Tạo ổ đĩa cài đặt Windows 11 cho các máy tính không có TPM hoặc Secure Boot" +"Feature8","707","Text","","Create persistent Linux partitions","إنشاء Persistent Linux partitions","Създаване на устойчиви Linux дялове","创建持久 Linux 分区","建立持續性 Linux 磁區","Stvaranje trajnih Linux particija","Vytvoření trvalých oddílů systému Linux","Lav vedvarende Linux adskillelser","Persistent Linux partities aanmaken","Luo pysyviä Linux-osioita","Créez des partitions persistentes pour Linux","Persistente Linux-Partitionen erstellen","Δημιουργήστε μόνιμα διαμερίσματα Linux","יצירת מחיצות Linux קבועות","Tartós Linux partíciók készítése","Buat partisi Linux yang tetap/persistent","Crea partizioni persistenti Linux","記録用Linuxパーティションを作成します。","영구 리눅스 파티션 만들기","Izveido pastāvīgas Linux partīcijas","Sukurkite nuolatinius Linux skaidinius","Buat partition Linux berterusan","Lag persistente Linux partisjoner","ایجاد پارتیشن های لینوکس دائمی","Stwórz particje persistent Linuxa","Criar partições persistentes para Linux","Crie partições persistentes para Linux","Crează partiție de Linux persistentă","Создание постоянных разделов Linux","Kreiranje upornih Linux particija","Vytvorte trvalé oblasti systému Linux","Ustvarjanje trajnih Linux particij","Crear particiones persistentes de Linux","Skapa beständiga Linux-partitioner","สร้าง Linux partition แบบ persistent","Kalıcı Linux bölümleri oluşturun","Створення розділу збереження Linux","Tạo phân vùng Linux liên tục" +"Feature9","708","Text","","Create VHD/DD images of the selected drive","إنشاء صور VHD / DD لمحرك الأقراص المحدد","Създаване на VHD/DD образи на избраното устройство","为选择的驱动器创建 VHD/DD 镜像","為選中的磁碟機建立 VHD/DD 映像檔","Stvaranje VHD/DD slika odabranog pogona","Vytvoření obrazů VHD/DD z vybrané jednotky","Lav VHD/DD billeder af det valgte drev","VHD/DD-images van de geselecteerde schijf aanmaken","Luo VHD/DD-kuvia valitusta asemasta","Créez des images VHD/DD du périphérique sélectionné","VHD/DD-Images des ausgewählten Laufwerks erstellen","Δημιουργήστε εικόνες VHD/DD της επιλεγμένης μονάδας δίσκου","יצירת קובצי תמונה מסוג VHD/DD של הכונן שנבחר","VHD/DD képfájl készítése a kiválasztott meghajtóról","Buat image VHD/DD dari penyimpanan yang dipilih","Crea immagini VHD/DD dell'unità selezionata","選択されたドライブのVHD/DDイメージを作成します。","선택한 드라이브의 VHD/DD 이미지 만들기","Izveido izvēlētā diska VHD/DD virtuālos attēlus","Sukurkite pasirinkto disko VHD / DD vaizdus","Buat imej VHD/DD bagi pemacu yang dipilih","Lag VHD/DD speilinger av valgt disk","تصاویر VHD/DD از درایو انتخاب شده ایجاد کنید","Stwórz obraz VHD/DD z wybranego dysku","Criar imagens VHD/DD do dispositivo selecionado","Criar imagens VHD/DD do dispositivo selecionado","Crează imagini VHD/DD de pe drive-ul selectat","Создание образов VHD/DD выбранного диска","Kreiranje VHD/DD slika izabrane disk jedinice","Vytvorte obrazy VHD/DD z vybratej jednotky","Ustvarjanje VHD/DD slik izbranega pogona","Cree imágenes VHD/DD de la unidad seleccionada","Skapa VHD/DD-avbilder av den valda enheten","สร้างอิมเมจไฟล์แบบ VHD/DD จากไดรฟ์ที่เลือก","Seçilen sürücünün VHD/DD yansılarını oluşturun","Створення образів VHD/DD з вибраних дисків","Tạo tệp VHD/DD từ ổ đĩa đã chọn" +"Feature10","709","Text","","Compute MD5, SHA-1, SHA-256 and SHA-512 checksums of the selected image","حساب المجاميع الإختبارية MD5 و SHA-1 و SHA-256 و SHA-512 للصورة المحددة","Изчисляване на MD5, SHA-1, SHA-256 и SHA-512 чексуми на избраният образ","计算被选择镜像的 MD5、SHA-1、SHA-256 和 SHA-512 校验码","計算被選中映像的 MD5、SHA-1、SHA-256 和 SHA-512 檢查碼","Izračunajte kontrolne zbrojeve odabrane slike MD5, SHA-1, SHA-256 i SHA-512","Výpočet kontrolních součtů MD5, SHA-1, SHA-256 a SHA-512 vybraného obrazu","Beregn MD5, SHA-1, SHA-256 og SHA-512 checksums af det valgte billede","MD5, SHA-1, SHA-256 en SHA-512 controlesommen berekenen van de geselecteerde image","Laske MD5, SHA-1, SHA-256 ja SHA-512 tarkistussummia valitusta levykuvasta","Calculez les sommes de contrôle MD5, SHA-1, SHA-256 et SHA-512 de l'image sélectionnée","Berechnung von MD5-, SHA-1-, SHA-256- und SHA-512-Prüfsummen für das ausgewählte Bild","Υπολογίστε τα αθροίσματα ελέγχου MD5, SHA-1, SHA-256 και SHA-512 της επιλεγμένης εικόνας","חישוב סיכומי ביקורת מסוג MD5,‏ SHA-1,‏ SHA-256 ו־SHA-512 של קובץ התמונה שנבחרה","A kiválasztott képfájl MD5, SHA-1, SHA-256 és SHA-512 ellenőrző összegének kiszámítása","Hitung checksum MD5, SHA-1, SHA-256 dan SHA-512 dari image yang dipilih","Calcola i checksum MD5, SHA-1, SHA-256 e SHA-512 dell'immagine selezionata","選択されたイメージのMD5、SHA-1、SHA-256及びSHA-512チェックサムを計算します。","선택한 이미지의 MD5, SHA-1, SHA-256 및 SHA-512 체크섬 계산","Izskaitļo izvēlētā virtuālā attēla MD5, SHA-1, SHA-256 un SHA-512 kontrolsummas","Apskaičiuokite pasirinkto vaizdo MD5, SHA-1, SHA-256 ir SHA-512 kontrolines sumas","Kira MD5, SHA-1, SHA-256 dan SHA-512 checksum imej yang dipilih","Kalkuler MD5, SHA-1, SHA-256 og SHA-512 sjekksummer fra valgt speiling","MD5، SHA-1، SHA-256 و SHA-512 را برای تصویر انتخابی محاسبه کنید","Oblicz sumy kontrolne MD5, SHA-1, SHA-256 i SHA-512 dla wybranego obrazu","Calcular somas de verificação MD5, SHA-1, SHA-256 e SHA-512 da imagem selecionada","Calcular checksums MD5, SHA-1, SHA-256 e SHA-512 da imagem selecionada","Compută MD5, SHA-1, SHA-256 și SHA-512 suma de control ale imaginilor selectate","Вычисление контрольных сумм MD5, SHA-1, SHA-256 и SHA-512 выбранного образа","Izračunajte MD5, SHA-1, SHA-256 i SHA-512 kontrolne preglede izabrane slike","Vypočítajte kontrolné súčty vybratého obrazu (MD5, SHA-1, SHA-256 a SHA-512)","Račun MD5, SHA-1, SHA-256 in SHA-512 kontrolni vsoti izbrane slike","Calcule las sumas de comprobación MD5, SHA-1, SHA-256 y SHA-512 de la imagen seleccionada","Beräkna kontrollsummor MD5, SHA-1, SHA-256 och SHA-512 för den valda avbilden","คำนวณรหัส MD5, SHA-1, SHA-256, SHA-512 ของไฟล์อิมเมจที่เลือก","Seçilen yansının MD5, SHA-1, SHA-256 ve SHA-512 sağlama toplamlarını hesaplayın","Обчислення контрольних сум MD5, SHA-1, SHA-256 та SHA-512 для вибраних образів","Tính tổng kiểm MD5, SHA-1, SHA-256 và SHA-512 của tệp đã chọn" +"Feature11","710","Text","","Perform bad blocks checks, including detection of ""fake"" flash drives","إجراء فحوصات كتل تالفة ، بما في ذلك الكشف عن محركات أقراص فلاش ""زائفة\","Проверяване за лоши блокове, включително засичане на ""фалшиви"" устройства","执行坏块检查,包括对”假“U盘的检测","執行壞軌檢查,包括對”假“USB 快閃磁碟機的偵測","Izvršite provjere loših blokova, uključujući otkrivanje ""lažnih"" flash pogona","Provést kontrolu vadných bloků, včetně detekce ""falešných"" bloků. flash disky","Udøv dårlige blokke tjeks, inklusiv opdagelse af ""falske"" flashdrev","Controles uitvoeren op slechte blokken, inclusief detectie van ""valse"" flashdrives","Suorita viallisten lohkojen tarkistuksia, sisältäen ""valheellisten"" muistitikkujen tunnistamisen","Executez un test de mauvais secteurs avec detection des ""fake drives\","Durchführung von Prüfungen auf fehlerhafte Blöcke, einschließlich der Erkennung von ""gefälschten"" Flash-Laufwerken","Εκτελέστε ελέγχους εσφαλμένων block, συμπεριλαμβανομένου του εντοπισμού ""ψευδών"" μονάδων flash","ביצוע בדיקות אחר בלוקים (אזורים) פגומים, כולל זיהוי של כונני הבזק ""מזוייפים\","Hibás blokkok ellenőrzése, beleértve a ""hamis"" flash meghajtók detektálását","Lakukan cek Blok yang buruk, termasuk deteksi USB Flash Disk ""PALSU\","Esegui controlli dei blocchi danneggiati, incluso il rilevamento di unità flash ""false\","不良ブロックチェック及び容量詐欺ドライブの検知を行います。","""위조"" 플래시 드라이브 감지를 포함하여 불량 블록 검사 수행","Izpilda bojāto bloku pārbaudi ieskaitot ""falsificēto"" nesēju noteikšanu","Atlikite blogų blokų patikrinimus, įskaitant ""netikrų"" flash diskų aptikimą","Melakukan pemeriksaan blok buruk, termasuk pengesanan pemacu kilat ""palsu\","Utfør sjekk for dårlige sektorer, inkludert sjekk for forfalskede flash disker","بررسی بلوک های بد، از جمله تشخیص درایوهای فلش ""جعلی"" را انجام دهید","Sprawdź dysk pod względem spójności danych lub wykryj ""nieorginalny"" pendrive","Executar verificações de blocos defeituosos, incluindo detecção de unidades flash ""falsificadas\","Executar verificações de blocos inválidos, incluindo a deteção de unidades flash ""falsas\","Verifică blocuri rele, incluzând detectarea de drive-uri flash ""false\","Проверка на плохие блоки, обнаружение ""поддельных"" флешек","Izvršite provere loših blokova, uključujući otkrivanje ""lažnih"" fleš diskova","Vykonajte kontroly zlých blokov vrátane detekcie „falošných"" prenosných diskov","Izvajanje preverjanj slabih blokov, vključno z odkrivanjem »lažnih« bliskavic","Realice comprobaciones de bloques defectuosos, incluida la detección de unidades flash ""falsas\","Utför kontroll av trasiga block, inklusive upptäckt av ""falska"" USB-minnen","ตรวจสอบจุดบกพร่อง รวมไปถึงการทดสอบแฟลชไดรฟ์ว่าเป็น ""ของปลอม"" หรือไม่","""Sahte"" flash sürücülerin tespiti de dahil olmak üzere hatalı blok kontrolleri gerçekleştirin","Перевірка дисків (включаючи фальшиві диски)","Thực hiện kiểm tra điểm lỗi, bao gồm phát hiện ổ đĩa ""giả\" +"Feature12","711","Text","","Download official Microsoft Windows retail ISOs","قم بتنزيل ملفات ISO الرسمية الخاصة بـ Microsoft Windows","Изтегляне на официални Microsoft Windows ISO образи","下载微软官方 Windows 镜像","下載微軟官方 Windows 映像檔","Preuzimanje službenih ISO-ova za maloprodaju sustava Microsoft Windows","Stažení oficiálních souborů ISO systému Microsoft Windows","Hent officielle Microsoft Windows detail ISOer","Officiële Microsoft Windows retail ISO's downloaden","Lataa virallisia Microsoft Windowsin jälleenmyyntiversion ISO-levykuvia","Téléchargez des images ISOs commerciales officielles de Microsoft Windows","Offizielle Microsoft Windows-ISOs herunterladen","Κατεβάστε τα επίσημα retail ISO των Microsoft Windows","הורדת קובצי ה־ISO הקמעונאיים הרשמיים של Microsoft Windows","Hivatalos Microsoft Windows kiskereskedelmi ISO képfájlok letöltése","Unduh ISO Microsoft Windows resmi","Scarica le ISO ufficiali di Microsoft Windows","マイクロソフト公式のWindows ISOをダウンロードします。","공식 Microsoft Windows 리테일 ISO 다운로드","Lejupielādē oficiālos Microsoft ISO failus","Atsisiųskite oficialius Microsoft Windows mažmeninės prekybos ISO","Muat turun rasmi ISO runcit Microsoft Windows","Last ned offisielle Windows ISOer","ISO های رسمی ماکروسافت را دریافت کنید","Pobierz oficjalny obraz ISO systemu Microsoft Windows","Baixar ISOs oficiais do Microsoft Windows","Transferir ISOs oficiais do Microsoft Windows Retail","Descarcă un Microsoft Windows ISO oficial de vânzare","Загрузка официальных ISO-образов Windows","Preuzmite zvanične Microsoft Windows maloprodajne ISO-ove","Stiahnite si oficiálne ISO pre Microsoft Windows","Prenos uradnih Microsoft Windows maloprodaja ISOs","Descargue los ISO oficiales de Microsoft Windows","Ladda ner officiella Microsoft Windows ISO-filer","ดาวน์โหลดไฟล์ ISO ของ Microsoft Windows จากเว็บไซต์ทางการของ Microsoft","Resmi Microsoft Windows Retail ISO'larını indirin","Завантаження офіційних образів Microsoft Windows","Tải xuống các tệp Microsoft Windows ISO bán lẻ chính thức" +"Feature13","712","Text","","Download UEFI Shell ISOs","قم بتنزيل UEFI Shell ISOs","Изтегляне на UEFI Shell образи","下载 UEFI Shell 镜像","下載 UEFI Shell 映像檔","Preuzmite ISO-ove UEFI ljuske","Stažení souborů UEFI Shell ISO","Hent UEFI Shell ISOer","UEFI Shell ISO's downloaden","Lataa UEFI Shell ISO-levykuvia","Téléchargez des images ISOs du Shell UEFI","UEFI-Shell-ISOs herunterladen","Κατεβάστε τα ISO Shell UEFI","הורדת קובצי ISO של מעטפת UEFI","UEFI Shell ISO képfájlok letöltése","Unduh Shell ISO UEFI","Scarica le ISO della shell UEFI","UEFIシェルのISOをダウンロードします。","UEFI Shell ISO 다운로드","Lejupielādē UEFI OS ISO failus","Atsisiųskite UEFI Shell ISO","Muat turun ISO Shell UEFI","Last ned UEFI kommandolinje ISOer","ISO های پوسته UEFI را دانلود کنید","Ściągnij obrazy ISO UEFI Shell","Baixar ISOs do Shell UEFI","Transferir ISOs de UEFI Shell","Descarcă UEFI Shell ISO-uri","Загрузка ISO-образов оболочки UEFI","Preuzmite UEFI Shell ISOs","Stiahnite UEFI Shell ISO","Prenos UEFI Shell ISOs","Descargar ISO de UEFI Shell","Ladda ner UEFI-skal ISO-filer","ดาวน์โหลดไฟล์ ISO ของ UEFI Shell","UEFI Shell ISO'larını indirin","Завантаження командної оболонки UEFI ISO","Tải xuống các tệp UEFI Shell ISO" +"Feature14","713","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Feature15","714","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Feature16","715","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Feature17","716","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Feature18","717","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Feature19","718","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Feature20","719","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq1","800","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq2","801","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq3","802","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq4","803","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq5","804","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq6","805","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq7","806","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq8","807","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq9","808","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq10","809","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"MinimumHardwareReq11","810","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq1","850","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq2","851","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq3","852","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq4","853","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq5","854","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq6","855","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq7","856","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq8","857","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq9","858","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq10","859","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"RecommendedHardwareReq11","860","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"SearchTerm1","900","Text","Boot","Boot","الإقلاع (Boot)","","启动","啟動","","","","Opstarten","Boottaus","Amorçable","","","בוט","","","Avvio","起動","부팅","Ielāde","Batas","","Oppstart","راه‌اندازی","","Inicialização","Inicializável","Bootează","Загрузочный","","boot","Zagon","Arranque","Uppstart","","Önyükle","Отримати","Khởi động" +"SearchTerm2","901","Text","USB",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"SearchTerm3","902","Text","ISO",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"SearchTerm4","903","Text","Windows",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"SearchTerm5","904","Text","Linux",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"SearchTerm6","905","Text","UEFI",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"SearchTerm7","906","Text","Windows To Go",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerToPlayAtTopOfListing","999","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer1","1000","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer2","1001","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer3","1002","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer4","1003","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer5","1004","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer6","1005","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer7","1006","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer8","1007","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer9","1008","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer10","1009","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer11","1010","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer12","1011","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer13","1012","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer14","1013","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"Trailer15","1014","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle1","1020","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle2","1021","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle3","1022","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle4","1023","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle5","1024","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle6","1025","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle7","1026","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle8","1027","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle9","1028","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle10","1029","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle11","1030","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle12","1031","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle13","1032","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle14","1033","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerTitle15","1034","Text","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail1","1040","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail2","1041","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail3","1042","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail4","1043","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail5","1044","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail6","1045","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail7","1046","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail8","1047","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail9","1048","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail10","1049","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail11","1050","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail12","1051","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail13","1052","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail14","1053","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"TrailerThumbnail15","1054","Relative path (or URL to file in Partner Center)","",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/res/appstore/listing/lt-lt/Screenshot1.png b/res/appstore/listing/lt-lt/Screenshot1.png new file mode 100644 index 00000000..fb42fef9 Binary files /dev/null and b/res/appstore/listing/lt-lt/Screenshot1.png differ diff --git a/res/appstore/listing/lv-lv/Screenshot1.png b/res/appstore/listing/lv-lv/Screenshot1.png new file mode 100644 index 00000000..ec69b3e4 Binary files /dev/null and b/res/appstore/listing/lv-lv/Screenshot1.png differ diff --git a/res/appstore/listing/ms-my/Screenshot1.png b/res/appstore/listing/ms-my/Screenshot1.png new file mode 100644 index 00000000..77aacf10 Binary files /dev/null and b/res/appstore/listing/ms-my/Screenshot1.png differ diff --git a/res/appstore/listing/nb-no/Screenshot1.png b/res/appstore/listing/nb-no/Screenshot1.png new file mode 100644 index 00000000..4291beb8 Binary files /dev/null and b/res/appstore/listing/nb-no/Screenshot1.png differ diff --git a/res/appstore/listing/nl-nl/Screenshot1.png b/res/appstore/listing/nl-nl/Screenshot1.png new file mode 100644 index 00000000..39d5834a Binary files /dev/null and b/res/appstore/listing/nl-nl/Screenshot1.png differ diff --git a/res/appstore/listing/pl-pl/Screenshot1.png b/res/appstore/listing/pl-pl/Screenshot1.png new file mode 100644 index 00000000..5ea26094 Binary files /dev/null and b/res/appstore/listing/pl-pl/Screenshot1.png differ diff --git a/res/appstore/listing/pt-br/Screenshot1.png b/res/appstore/listing/pt-br/Screenshot1.png new file mode 100644 index 00000000..ffdbef43 Binary files /dev/null and b/res/appstore/listing/pt-br/Screenshot1.png differ diff --git a/res/appstore/listing/pt-pt/Screenshot1.png b/res/appstore/listing/pt-pt/Screenshot1.png new file mode 100644 index 00000000..803a2ec4 Binary files /dev/null and b/res/appstore/listing/pt-pt/Screenshot1.png differ diff --git a/res/appstore/listing/ro-ro/Screenshot1.png b/res/appstore/listing/ro-ro/Screenshot1.png new file mode 100644 index 00000000..6eba1f81 Binary files /dev/null and b/res/appstore/listing/ro-ro/Screenshot1.png differ diff --git a/res/appstore/listing/ru-ru/Screenshot1.png b/res/appstore/listing/ru-ru/Screenshot1.png new file mode 100644 index 00000000..34772a5b Binary files /dev/null and b/res/appstore/listing/ru-ru/Screenshot1.png differ diff --git a/res/appstore/listing/sk-sk/Screenshot1.png b/res/appstore/listing/sk-sk/Screenshot1.png new file mode 100644 index 00000000..8ce89f3f Binary files /dev/null and b/res/appstore/listing/sk-sk/Screenshot1.png differ diff --git a/res/appstore/listing/sl-si/Screenshot1.png b/res/appstore/listing/sl-si/Screenshot1.png new file mode 100644 index 00000000..ac2f197c Binary files /dev/null and b/res/appstore/listing/sl-si/Screenshot1.png differ diff --git a/res/appstore/listing/sr-latn-rs/Screenshot1.png b/res/appstore/listing/sr-latn-rs/Screenshot1.png new file mode 100644 index 00000000..a1f8d045 Binary files /dev/null and b/res/appstore/listing/sr-latn-rs/Screenshot1.png differ diff --git a/res/appstore/listing/sv-se/Screenshot1.png b/res/appstore/listing/sv-se/Screenshot1.png new file mode 100644 index 00000000..fd17645b Binary files /dev/null and b/res/appstore/listing/sv-se/Screenshot1.png differ diff --git a/res/appstore/listing/th-th/Screenshot1.png b/res/appstore/listing/th-th/Screenshot1.png new file mode 100644 index 00000000..be1ca05d Binary files /dev/null and b/res/appstore/listing/th-th/Screenshot1.png differ diff --git a/res/appstore/listing/tr-tr/Screenshot1.png b/res/appstore/listing/tr-tr/Screenshot1.png new file mode 100644 index 00000000..7fbbd8a0 Binary files /dev/null and b/res/appstore/listing/tr-tr/Screenshot1.png differ diff --git a/res/appstore/listing/uk-ua/Screenshot1.png b/res/appstore/listing/uk-ua/Screenshot1.png new file mode 100644 index 00000000..f57dca80 Binary files /dev/null and b/res/appstore/listing/uk-ua/Screenshot1.png differ diff --git a/res/appstore/listing/vi-vn/Screenshot1.png b/res/appstore/listing/vi-vn/Screenshot1.png new file mode 100644 index 00000000..680a5a45 Binary files /dev/null and b/res/appstore/listing/vi-vn/Screenshot1.png differ diff --git a/res/appstore/listing/zh-cn/Screenshot1.png b/res/appstore/listing/zh-cn/Screenshot1.png new file mode 100644 index 00000000..fe1516bd Binary files /dev/null and b/res/appstore/listing/zh-cn/Screenshot1.png differ diff --git a/res/appstore/listing/zh-tw/Screenshot1.png b/res/appstore/listing/zh-tw/Screenshot1.png new file mode 100644 index 00000000..e36aed64 Binary files /dev/null and b/res/appstore/listing/zh-tw/Screenshot1.png differ diff --git a/res/appstore/listing_template.csv b/res/appstore/listing_template.csv new file mode 100644 index 00000000..dfcb183f --- /dev/null +++ b/res/appstore/listing_template.csv @@ -0,0 +1,203 @@ +Field,ID,Type (Type),default +Description,2,Text,"MSG_900 +• MSG_901 +• MSG_902 +• MSG_903" +ReleaseNotes,3,Text, +Title,4,Text,Rufus +ShortTitle,5,Text, +SortTitle,6,Text, +VoiceTitle,7,Text, +ShortDescription,8,Text,MSG_174 +DevStudio,9,Text,Pete Batard +CopyrightTrademarkInformation,12,Text, +AdditionalLicenseTerms,13,Text,MSG_904 +DesktopScreenshot1,100,Relative path (or URL to file in Partner Center), +DesktopScreenshot2,101,Relative path (or URL to file in Partner Center), +DesktopScreenshot3,102,Relative path (or URL to file in Partner Center), +DesktopScreenshot4,103,Relative path (or URL to file in Partner Center), +DesktopScreenshot5,104,Relative path (or URL to file in Partner Center), +DesktopScreenshot6,105,Relative path (or URL to file in Partner Center), +DesktopScreenshot7,106,Relative path (or URL to file in Partner Center), +DesktopScreenshot8,107,Relative path (or URL to file in Partner Center), +DesktopScreenshot9,108,Relative path (or URL to file in Partner Center), +DesktopScreenshot10,109,Relative path (or URL to file in Partner Center), +DesktopScreenshotCaption1,150,Text, +DesktopScreenshotCaption2,151,Text, +DesktopScreenshotCaption3,152,Text, +DesktopScreenshotCaption4,153,Text, +DesktopScreenshotCaption5,154,Text, +DesktopScreenshotCaption6,155,Text, +DesktopScreenshotCaption7,156,Text, +DesktopScreenshotCaption8,157,Text, +DesktopScreenshotCaption9,158,Text, +DesktopScreenshotCaption10,159,Text, +MobileScreenshot1,200,Relative path (or URL to file in Partner Center), +MobileScreenshot2,201,Relative path (or URL to file in Partner Center), +MobileScreenshot3,202,Relative path (or URL to file in Partner Center), +MobileScreenshot4,203,Relative path (or URL to file in Partner Center), +MobileScreenshot5,204,Relative path (or URL to file in Partner Center), +MobileScreenshot6,205,Relative path (or URL to file in Partner Center), +MobileScreenshot7,206,Relative path (or URL to file in Partner Center), +MobileScreenshot8,207,Relative path (or URL to file in Partner Center), +MobileScreenshot9,208,Relative path (or URL to file in Partner Center), +MobileScreenshot10,209,Relative path (or URL to file in Partner Center), +MobileScreenshotCaption1,250,Text, +MobileScreenshotCaption2,251,Text, +MobileScreenshotCaption3,252,Text, +MobileScreenshotCaption4,253,Text, +MobileScreenshotCaption5,254,Text, +MobileScreenshotCaption6,255,Text, +MobileScreenshotCaption7,256,Text, +MobileScreenshotCaption8,257,Text, +MobileScreenshotCaption9,258,Text, +MobileScreenshotCaption10,259,Text, +XboxScreenshot1,300,Relative path (or URL to file in Partner Center), +XboxScreenshot2,301,Relative path (or URL to file in Partner Center), +XboxScreenshot3,302,Relative path (or URL to file in Partner Center), +XboxScreenshot4,303,Relative path (or URL to file in Partner Center), +XboxScreenshot5,304,Relative path (or URL to file in Partner Center), +XboxScreenshot6,305,Relative path (or URL to file in Partner Center), +XboxScreenshot7,306,Relative path (or URL to file in Partner Center), +XboxScreenshot8,307,Relative path (or URL to file in Partner Center), +XboxScreenshot9,308,Relative path (or URL to file in Partner Center), +XboxScreenshot10,309,Relative path (or URL to file in Partner Center), +XboxScreenshotCaption1,350,Text, +XboxScreenshotCaption2,351,Text, +XboxScreenshotCaption3,352,Text, +XboxScreenshotCaption4,353,Text, +XboxScreenshotCaption5,354,Text, +XboxScreenshotCaption6,355,Text, +XboxScreenshotCaption7,356,Text, +XboxScreenshotCaption8,357,Text, +XboxScreenshotCaption9,358,Text, +XboxScreenshotCaption10,359,Text, +HolographicScreenshot1,400,Relative path (or URL to file in Partner Center), +HolographicScreenshot2,401,Relative path (or URL to file in Partner Center), +HolographicScreenshot3,402,Relative path (or URL to file in Partner Center), +HolographicScreenshot4,403,Relative path (or URL to file in Partner Center), +HolographicScreenshot5,404,Relative path (or URL to file in Partner Center), +HolographicScreenshot6,405,Relative path (or URL to file in Partner Center), +HolographicScreenshot7,406,Relative path (or URL to file in Partner Center), +HolographicScreenshot8,407,Relative path (or URL to file in Partner Center), +HolographicScreenshot9,408,Relative path (or URL to file in Partner Center), +HolographicScreenshot10,409,Relative path (or URL to file in Partner Center), +HolographicScreenshotCaption1,450,Text, +HolographicScreenshotCaption2,451,Text, +HolographicScreenshotCaption3,452,Text, +HolographicScreenshotCaption4,453,Text, +HolographicScreenshotCaption5,454,Text, +HolographicScreenshotCaption6,455,Text, +HolographicScreenshotCaption7,456,Text, +HolographicScreenshotCaption8,457,Text, +HolographicScreenshotCaption9,458,Text, +HolographicScreenshotCaption10,459,Text, +StoreLogo720x1080,600,Relative path (or URL to file in Partner Center), +StoreLogo1080x1080,601,Relative path (or URL to file in Partner Center), +StoreLogo300x300,602,Relative path (or URL to file in Partner Center), +OverrideLogosForWin10,603,True/False,FALSE +StoreLogoOverride150x150,604,Relative path (or URL to file in Partner Center), +StoreLogoOverride71x71,605,Relative path (or URL to file in Partner Center), +PromoImage1920x1080,606,Relative path (or URL to file in Partner Center), +PromoImage2400x1200,607,Relative path (or URL to file in Partner Center), +XboxBrandedKeyArt584x800,608,Relative path (or URL to file in Partner Center), +XboxTitledHero1920x1080,609,Relative path (or URL to file in Partner Center), +XboxFeaturedPromo1080x1080,610,Relative path (or URL to file in Partner Center), +OptionalPromo358x358,611,Relative path (or URL to file in Partner Center), +OptionalPromo1000x800,612,Relative path (or URL to file in Partner Center), +OptionalPromo414x180,613,Relative path (or URL to file in Partner Center), +Feature1,700,Text,MSG_910 +Feature2,701,Text,MSG_911 +Feature3,702,Text,MSG_912 +Feature4,703,Text,MSG_913 +Feature5,704,Text,MSG_914 +Feature6,705,Text,MSG_915 +Feature7,706,Text,MSG_916 +Feature8,707,Text,MSG_917 +Feature9,708,Text,MSG_918 +Feature10,709,Text,MSG_919 +Feature11,710,Text,MSG_920 +Feature12,711,Text,MSG_921 +Feature13,712,Text,MSG_922 +Feature14,713,Text, +Feature15,714,Text, +Feature16,715,Text, +Feature17,716,Text, +Feature18,717,Text, +Feature19,718,Text, +Feature20,719,Text, +MinimumHardwareReq1,800,Text, +MinimumHardwareReq2,801,Text, +MinimumHardwareReq3,802,Text, +MinimumHardwareReq4,803,Text, +MinimumHardwareReq5,804,Text, +MinimumHardwareReq6,805,Text, +MinimumHardwareReq7,806,Text, +MinimumHardwareReq8,807,Text, +MinimumHardwareReq9,808,Text, +MinimumHardwareReq10,809,Text, +MinimumHardwareReq11,810,Text, +RecommendedHardwareReq1,850,Text, +RecommendedHardwareReq2,851,Text, +RecommendedHardwareReq3,852,Text, +RecommendedHardwareReq4,853,Text, +RecommendedHardwareReq5,854,Text, +RecommendedHardwareReq6,855,Text, +RecommendedHardwareReq7,856,Text, +RecommendedHardwareReq8,857,Text, +RecommendedHardwareReq9,858,Text, +RecommendedHardwareReq10,859,Text, +RecommendedHardwareReq11,860,Text, +SearchTerm1,900,Text,MSG_905 +SearchTerm2,901,Text,USB +SearchTerm3,902,Text,ISO +SearchTerm4,903,Text,Windows +SearchTerm5,904,Text,Linux +SearchTerm6,905,Text,UEFI +SearchTerm7,906,Text,Windows To Go +TrailerToPlayAtTopOfListing,999,Relative path (or URL to file in Partner Center), +Trailer1,1000,Relative path (or URL to file in Partner Center), +Trailer2,1001,Relative path (or URL to file in Partner Center), +Trailer3,1002,Relative path (or URL to file in Partner Center), +Trailer4,1003,Relative path (or URL to file in Partner Center), +Trailer5,1004,Relative path (or URL to file in Partner Center), +Trailer6,1005,Relative path (or URL to file in Partner Center), +Trailer7,1006,Relative path (or URL to file in Partner Center), +Trailer8,1007,Relative path (or URL to file in Partner Center), +Trailer9,1008,Relative path (or URL to file in Partner Center), +Trailer10,1009,Relative path (or URL to file in Partner Center), +Trailer11,1010,Relative path (or URL to file in Partner Center), +Trailer12,1011,Relative path (or URL to file in Partner Center), +Trailer13,1012,Relative path (or URL to file in Partner Center), +Trailer14,1013,Relative path (or URL to file in Partner Center), +Trailer15,1014,Relative path (or URL to file in Partner Center), +TrailerTitle1,1020,Text, +TrailerTitle2,1021,Text, +TrailerTitle3,1022,Text, +TrailerTitle4,1023,Text, +TrailerTitle5,1024,Text, +TrailerTitle6,1025,Text, +TrailerTitle7,1026,Text, +TrailerTitle8,1027,Text, +TrailerTitle9,1028,Text, +TrailerTitle10,1029,Text, +TrailerTitle11,1030,Text, +TrailerTitle12,1031,Text, +TrailerTitle13,1032,Text, +TrailerTitle14,1033,Text, +TrailerTitle15,1034,Text, +TrailerThumbnail1,1040,Relative path (or URL to file in Partner Center), +TrailerThumbnail2,1041,Relative path (or URL to file in Partner Center), +TrailerThumbnail3,1042,Relative path (or URL to file in Partner Center), +TrailerThumbnail4,1043,Relative path (or URL to file in Partner Center), +TrailerThumbnail5,1044,Relative path (or URL to file in Partner Center), +TrailerThumbnail6,1045,Relative path (or URL to file in Partner Center), +TrailerThumbnail7,1046,Relative path (or URL to file in Partner Center), +TrailerThumbnail8,1047,Relative path (or URL to file in Partner Center), +TrailerThumbnail9,1048,Relative path (or URL to file in Partner Center), +TrailerThumbnail10,1049,Relative path (or URL to file in Partner Center), +TrailerThumbnail11,1050,Relative path (or URL to file in Partner Center), +TrailerThumbnail12,1051,Relative path (or URL to file in Partner Center), +TrailerThumbnail13,1052,Relative path (or URL to file in Partner Center), +TrailerThumbnail14,1053,Relative path (or URL to file in Partner Center), +TrailerThumbnail15,1054,Relative path (or URL to file in Partner Center), diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd new file mode 100644 index 00000000..04b8f0dc --- /dev/null +++ b/res/appstore/packme.cmd @@ -0,0 +1,187 @@ +@rem This script creates the Rufus appxupload for upload to the Windows Store. +@rem It attemps to follow as closely as possible what Visual Studio does. +@echo off +setlocal EnableExtensions DisableDelayedExpansion + +rem if set, this will override the version for the package +rem set VERSION_OVERRIDE=4.4.2104.0 + +goto main + +:ReplaceTokenInFile +setlocal EnableDelayedExpansion +set FILE=%~1 +set TOKEN=%~2 +set VALUE=%~3 +for /f "delims=" %%i in ('type %FILE% ^& break ^> %FILE%') do ( + set "line=%%i" + >>%FILE% echo(!line:%TOKEN%=%VALUE%! +) +endlocal +exit /B 0 + +:main +del /q *.appx >NUL 2>&1 +del /q *.appxbundle >NUL 2>&1 +del /q *.map >NUL 2>&1 + +set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64 +set ZIP_PATH=C:\Program Files\7-Zip +set SIGNATURE_SHA1=3dbc3a2a0e9ce8803b422cfdbc60acd33164965d +set MANIFEST=AppxManifest.xml +set ARCHS=x86 x64 arm arm64 +set DEFAULT_SCALE=200 +set OTHER_SCALES=100 125 150 400 +set SCALED_IMAGES=LargeTile SmallTile Square44x44Logo Square150x150Logo StoreLogo Wide310x150Logo +rem All the languages listed below *MUST* match the ones from the Resources section of AppManifest.xml +rem Oh, and these must be *valid* codes that Microsoft accepts, else your users will get an error +rem (that the Microsoft validation and certification process will *NOT* catch) during install. +set DEFAULT_LANGUAGE=en-US +set ADDITIONAL_LANGUAGES=ar-SA bg-BG zh-CN zh-TW hr-HR cs-CZ da-DK nl-NL fi-FI fr-FR de-DE el-GR he-IL hu-HU id-ID it-IT ja-JP ko-KR lv-LV lt-LT ms-MY nb-NO fa-IR pl-PL pt-BR pt-PT ro-RO ru-RU sr-Latn-RS sk-SK sl-SI es-ES sv-SE th-TH tr-TR uk-UA vi-VN +set PACKAGE_IMAGES=^ + Square44x44Logo.altform-lightunplated_targetsize-16.png^ + Square44x44Logo.altform-lightunplated_targetsize-24.png^ + Square44x44Logo.altform-lightunplated_targetsize-256.png^ + Square44x44Logo.altform-lightunplated_targetsize-32.png^ + Square44x44Logo.altform-lightunplated_targetsize-48.png^ + Square44x44Logo.altform-unplated_targetsize-16.png^ + Square44x44Logo.altform-unplated_targetsize-256.png^ + Square44x44Logo.altform-unplated_targetsize-32.png^ + Square44x44Logo.altform-unplated_targetsize-48.png^ + Square44x44Logo.targetsize-16.png^ + Square44x44Logo.targetsize-24.png^ + Square44x44Logo.targetsize-24_altform-unplated.png^ + Square44x44Logo.targetsize-256.png^ + Square44x44Logo.targetsize-32.png^ + Square44x44Logo.targetsize-48.png + +rem if you don't set the temp/tmp you get: +rem error MSB6001: Invalid command line switch for "CL.exe". System.ArgumentExcep Key being added: 'TEMP' +set temp= +set tmp= + +cd /d "%~dp0" + +for %%a in (%ARCHS%) do ( + if not exist rufus_%%a.exe ( + echo rufus_%%a.exe is missing from the current directory + goto out + ) +) + +rem exiftool.exe can't be installed in the Windows system directories... +if not exist exiftool.exe ( + echo exiftool.exe must exist in this directory + goto out +) + +rem Make sure we're not trying to create a package from an ALPHA or BETA version! +exiftool -s3 -*InternalName* rufus_x64.exe | findstr /C:"ALPHA" 1>nul && ( + echo Alpha version detected - ABORTED + goto out +) +exiftool -s3 -*InternalName* rufus_x64.exe | findstr /C:"BETA" 1>nul && ( + echo Beta version detected - ABORTED + goto out +) + +rem Populate the version from the executable +if "%VERSION_OVERRIDE%"=="" ( + exiftool -s3 -*FileVersionNumber* rufus_x64.exe > version.txt + set /p VERSION= bundle.map + +rem Now who the £$%^&* at Microsoft thought it was a good idea to have MakePri require '/dq lang-en-US_lang-fr-FR-...' +rem so that you actually end up with a in priconfig.xml?!? +rem Oh, and of course, good luck finding this documented ANYWHERE on Microsoft's website! +setlocal EnableDelayedExpansion +set STUPID_MAKEPRI_LANGUAGES=lang-%DEFAULT_LANGUAGE% +for %%l in (%ADDITIONAL_LANGUAGES%) do ( + set STUPID_MAKEPRI_LANGUAGES=!STUPID_MAKEPRI_LANGUAGES!_lang-%%l +) +setlocal DisableDelayedExpansion + +for %%a in (%ARCHS%) do ( + echo. + echo Creating Rufus_%VERSION%_%%a.appx... + cd /d "%~dp0" + echo "Rufus_%VERSION%_%%a.appx" "Rufus_%VERSION%_%%a.appx">> bundle.map + mkdir %%a >NUL 2>&1 + cd %%a + mkdir Images >NUL 2>&1 + for %%i in (%PACKAGE_IMAGES%) do ( + copy "..\Images\%%i" Images\ >NUL 2>&1 + ) + for %%i in (%SCALED_IMAGES%) do ( + copy "..\Images\%%i.scale-%DEFAULT_SCALE%.png" Images\ >NUL 2>&1 + ) + mkdir rufus + copy "..\rufus_%%a.exe" "rufus\rufus.exe" >NUL 2>&1 + copy /y NUL "rufus\rufus.app" >NUL 2>&1 + rem When invoking MakePri, it is very important that you don't have files such as AppxManifest.xml or priconfig.xml + rem in the directory referenced by /pr or you may get ERROR_MRM_DUPLICATE_ENTRY when validating the submission as, + rem for instance, the 'AppxManifest.xml' from the 100% scale bundle will conflict the one from the x64 bundle. + "%WDK_PATH%\MakePri" createconfig /o /pv 10.0.0 /cf ..\priconfig.xml /dq %STUPID_MAKEPRI_LANGUAGES%_scale-%DEFAULT_SCALE%_theme-light + "%WDK_PATH%\MakePri" new /o /pr . /cf ..\priconfig.xml + del /q ..\priconfig.xml + copy ..\RufusAppxManifest.xml %MANIFEST% >NUL 2>&1 + call:ReplaceTokenInFile %MANIFEST% @ARCH@ %%a + call:ReplaceTokenInFile %MANIFEST% @VERSION@ %VERSION% + "%WDK_PATH%\MakeAppx" pack /o /d . /p ..\Rufus_%VERSION%_%%a.appx + if ERRORLEVEL 1 goto out +) + +for %%a in (%OTHER_SCALES%) do ( + echo. + echo Creating Rufus_%VERSION%_scale-%%a.appx... + cd /d "%~dp0" + echo "Rufus_%VERSION%_scale-%%a.appx" "Rufus_%VERSION%_scale-%%a.appx">> bundle.map + mkdir %%a >NUL 2>&1 + cd %%a + mkdir Images >NUL 2>&1 + for %%i in (%SCALED_IMAGES%) do ( + copy "..\Images\%%i.scale-%%a.png" Images\ >NUL 2>&1 + ) + "%WDK_PATH%\MakePri" createconfig /o /pv 10.0.0 /cf ..\priconfig.xml /dq %STUPID_MAKEPRI_LANGUAGES%_scale-%%a_theme-light + "%WDK_PATH%\MakePri" new /o /pr . /cf ..\priconfig.xml + del /q ..\priconfig.xml + copy ..\ScaleAppxManifest.xml %MANIFEST% >NUL 2>&1 + call:ReplaceTokenInFile %MANIFEST% @SCALE@ %%a + call:ReplaceTokenInFile %MANIFEST% @VERSION@ %VERSION% + "%WDK_PATH%\MakeAppx" pack /o /d . /p ..\Rufus_%VERSION%_scale-%%a.appx +) + +setlocal EnableDelayedExpansion +set ALL_ARCHS= +for %%a in (%ARCHS%) do set ALL_ARCHS=!ALL_ARCHS!_%%a +cd /d "%~dp0" +"%WDK_PATH%\MakeAppx" bundle /f bundle.map /bv %VERSION% /p Rufus_%VERSION%%ALL_ARCHS%.appxbundle +rem Visual Studio zips the appxbundle into an appxupload for store upload, so we do the same... +"%ZIP_PATH%\7z" a -tzip Rufus_%VERSION%%ALL_ARCHS%_bundle.appxupload Rufus_%VERSION%%ALL_ARCHS%.appxbundle +endlocal + +:out +cd /d "%~dp0" +for %%a in (%ARCHS%) do ( + rd /S /Q %%a >NUL 2>&1 +) +for %%a in (%OTHER_SCALES%) do ( + rd /S /Q %%a >NUL 2>&1 +) +del /q *.map >NUL 2>&1 +del /q *.appx >NUL 2>&1 +del /q *.appxbundle >NUL 2>&1 +pause +exit diff --git a/res/appstore/runme.ps1 b/res/appstore/runme.ps1 new file mode 100644 index 00000000..f26567e7 --- /dev/null +++ b/res/appstore/runme.ps1 @@ -0,0 +1,46 @@ +# PowerShell script to parse listing.csv and retrieve our screenshots +# Copyright © 2023 Pete Batard +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +try { + [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 +} catch {} + +# NB: All languages IDs from the .csv are lowercase version of the one +# from rufus.loc, except for 'sr-RS' that becomes 'sr-latn-rs'. + +function GetCellByName([object]$csv, [string]$row_name, [string]$column_name) +{ + foreach ($row in $csv | Where-Object {$_.Field -eq $row_name}) { + foreach ($column in $row.PSObject.properties) { + if ($column.name -eq $column_name) { + return $column.value + } + } + } + return [string]::Empty +} + +$csv = Import-Csv -Path .\listing.csv +$langs = $csv | Select-Object -First 1 | Select * -ExcludeProperty 'Field','ID','Type (Type)','default' | ForEach-Object { $_.PSObject.Properties } | Select-Object -ExpandProperty Name + +foreach ($lang in $langs) { + $null = New-Item $lang -ItemType Directory -Force + $url = GetCellByName $csv 'DesktopScreenshot1' $lang + # Annoying but heck if I'm gonna bother with Microsoft's Auth in PowerShell... + Start-Process -NoNewWindow -FilePath "C:\Program Files\Mozilla Firefox\firefox.exe" -ArgumentList "-new-tab $url" + Write-Host $lang; + $null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown'); +} diff --git a/res/down.ico b/res/down.ico deleted file mode 100644 index ccce932a..00000000 Binary files a/res/down.ico and /dev/null differ diff --git a/res/freedos/COMMAND.COM b/res/freedos/COMMAND.COM index b82008e4..f56ace7e 100644 Binary files a/res/freedos/COMMAND.COM and b/res/freedos/COMMAND.COM differ diff --git a/res/freedos/DISPLAY.EXE b/res/freedos/DISPLAY.EXE index a635bb9c..0b6b388d 100644 Binary files a/res/freedos/DISPLAY.EXE and b/res/freedos/DISPLAY.EXE differ diff --git a/res/freedos/ega.cpx b/res/freedos/EGA.CPX similarity index 100% rename from res/freedos/ega.cpx rename to res/freedos/EGA.CPX diff --git a/res/freedos/ega10.cpx b/res/freedos/EGA10.CPX similarity index 100% rename from res/freedos/ega10.cpx rename to res/freedos/EGA10.CPX diff --git a/res/freedos/ega11.cpx b/res/freedos/EGA11.CPX similarity index 100% rename from res/freedos/ega11.cpx rename to res/freedos/EGA11.CPX diff --git a/res/freedos/ega12.cpx b/res/freedos/EGA12.CPX similarity index 100% rename from res/freedos/ega12.cpx rename to res/freedos/EGA12.CPX diff --git a/res/freedos/ega13.cpx b/res/freedos/EGA13.CPX similarity index 100% rename from res/freedos/ega13.cpx rename to res/freedos/EGA13.CPX diff --git a/res/freedos/ega14.cpx b/res/freedos/EGA14.CPX similarity index 100% rename from res/freedos/ega14.cpx rename to res/freedos/EGA14.CPX diff --git a/res/freedos/ega15.cpx b/res/freedos/EGA15.CPX similarity index 100% rename from res/freedos/ega15.cpx rename to res/freedos/EGA15.CPX diff --git a/res/freedos/ega16.cpx b/res/freedos/EGA16.CPX similarity index 100% rename from res/freedos/ega16.cpx rename to res/freedos/EGA16.CPX diff --git a/res/freedos/ega17.cpx b/res/freedos/EGA17.CPX similarity index 100% rename from res/freedos/ega17.cpx rename to res/freedos/EGA17.CPX diff --git a/res/freedos/ega18.cpx b/res/freedos/EGA18.CPX similarity index 100% rename from res/freedos/ega18.cpx rename to res/freedos/EGA18.CPX diff --git a/res/freedos/ega2.cpx b/res/freedos/EGA2.CPX similarity index 100% rename from res/freedos/ega2.cpx rename to res/freedos/EGA2.CPX diff --git a/res/freedos/ega3.cpx b/res/freedos/EGA3.CPX similarity index 100% rename from res/freedos/ega3.cpx rename to res/freedos/EGA3.CPX diff --git a/res/freedos/ega4.cpx b/res/freedos/EGA4.CPX similarity index 100% rename from res/freedos/ega4.cpx rename to res/freedos/EGA4.CPX diff --git a/res/freedos/ega5.cpx b/res/freedos/EGA5.CPX similarity index 100% rename from res/freedos/ega5.cpx rename to res/freedos/EGA5.CPX diff --git a/res/freedos/ega6.cpx b/res/freedos/EGA6.CPX similarity index 100% rename from res/freedos/ega6.cpx rename to res/freedos/EGA6.CPX diff --git a/res/freedos/ega7.cpx b/res/freedos/EGA7.CPX similarity index 100% rename from res/freedos/ega7.cpx rename to res/freedos/EGA7.CPX diff --git a/res/freedos/ega8.cpx b/res/freedos/EGA8.CPX similarity index 100% rename from res/freedos/ega8.cpx rename to res/freedos/EGA8.CPX diff --git a/res/freedos/ega9.cpx b/res/freedos/EGA9.CPX similarity index 100% rename from res/freedos/ega9.cpx rename to res/freedos/EGA9.CPX diff --git a/res/freedos/KERNEL.SYS b/res/freedos/KERNEL.SYS index c83522ef..6b524a99 100644 Binary files a/res/freedos/KERNEL.SYS and b/res/freedos/KERNEL.SYS differ diff --git a/res/freedos/MODE.COM b/res/freedos/MODE.COM new file mode 100644 index 00000000..43226fb8 Binary files /dev/null and b/res/freedos/MODE.COM differ diff --git a/res/freedos/mode.com b/res/freedos/mode.com deleted file mode 100644 index 13dd3bd6..00000000 Binary files a/res/freedos/mode.com and /dev/null differ diff --git a/res/freedos/readme.txt b/res/freedos/readme.txt index 3b91bb94..4064bc18 100644 --- a/res/freedos/readme.txt +++ b/res/freedos/readme.txt @@ -1,21 +1,11 @@ -o KERNEL.SYS was extracted from ke2041_386f32.zip available at: - https://sourceforge.net/projects/freedos/files/Kernel/2041/ +All of the executables found in this repository where extracted from: +https://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.3/official/FD13-FullUSB.zip + +o COMMAND.COM was extracted from packages\base\freecom.zip +o DISPLAY.EXE was extracted from packages\base\display.zip +o The EGA[#].CPX files were extracted from packages\base\cpidos.zip +o KERNEL.SYS was taken from packages\base\kernel.zip (KERNL386.SYS) It was modified to have FORCELBA enabled (byte offset 0x0D set to 0x01) - -o COMMAND.COM was extracted from the fd11src.iso -> ISOLINUX\FDBOOT.IMG at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.1/ - -o The EGA files were extracted from the cpidos30.zip available at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/cpi/ - -o DISPLAY.EXE was extracted from /disp013x.zip available at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/display - -o KEYB.EXE was extracted from KEYB201.ZIP available at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/keyb/2.01/ - -o The keyboard layouts (KEYB___.SYS) were extracted from kpdos31x.zip: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/keyb/kblayout/ - -o MODE.COM was extracted from mode-2005may12.zip available at: - http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/mode/2005/ +o KEYB.EXE was extracted from packages\base\keyb.zip +o The KEYB###.SYS keyboard layouts were extracted from packages\base\keyb_lay.zip +o MODE.COM was extracted from packages\base\mode.zip diff --git a/res/grub/grldr.mbr b/res/grub/grldr.mbr new file mode 100644 index 00000000..d168da09 Binary files /dev/null and b/res/grub/grldr.mbr differ diff --git a/res/grub/grub_version.h b/res/grub/grub_version.h new file mode 100644 index 00000000..3eabe7c3 --- /dev/null +++ b/res/grub/grub_version.h @@ -0,0 +1,5 @@ +/* + * This file contains the version string of the Grub4Dos 2.x binary embedded in Rufus. + * Should be the same as the grub4dos_version file in the source Grub4Dos was compiled from. + */ +#define GRUB4DOS_VERSION "0.4.6a" diff --git a/res/grub/readme.txt b/res/grub/readme.txt new file mode 100644 index 00000000..35183463 --- /dev/null +++ b/res/grub/readme.txt @@ -0,0 +1,12 @@ +This directory contains the Grub4DOS boot records that are used by Rufus + +* grldr.mbr was taken from the official 2023-03-06 release from + https://github.com/chenall/grub4dos/releases/tag/0.4.6a + +* Note that, for convenience reasons, the first 512 bytes from this grldr.mbr are + *not* the ones that Rufus processes when writing the actual MBR (first 512 bytes). + Instead, the byte array from src/ms-sys/inc/mbr_grub.h (whose content is identical) + is what Rufus uses. If you have modified this file, and the MBR section is altered, + be mindful that you also need to update the array in mbr_grub.h. + +* For details, see src/format.c, src/msys/br.c and src/msys/inc/mbr_grub.h. diff --git a/res/grub2/boot.img b/res/grub2/boot.img new file mode 100644 index 00000000..f2666422 Binary files /dev/null and b/res/grub2/boot.img differ diff --git a/res/grub2/core.img b/res/grub2/core.img new file mode 100644 index 00000000..f8d031b7 Binary files /dev/null and b/res/grub2/core.img differ diff --git a/res/grub2/grub2_version.h b/res/grub2/grub2_version.h new file mode 100644 index 00000000..72ed03a6 --- /dev/null +++ b/res/grub2/grub2_version.h @@ -0,0 +1,7 @@ +/* + * This file contains the version string of the GRUB 2.x binary embedded in Rufus. + * Should be the same as GRUB's PACKAGE_VERSION in config.h. + */ +#pragma once + +#define GRUB2_PACKAGE_VERSION "2.12" diff --git a/res/grub2/readme.txt b/res/grub2/readme.txt new file mode 100644 index 00000000..eb37a76d --- /dev/null +++ b/res/grub2/readme.txt @@ -0,0 +1,24 @@ +This directory contains the Grub 2.0 boot records that are used by Rufus + +* boot.img and core.img were created from a patched (since the offcial GRUB 2.12 release is *BROKEN*): + https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz + on a Debian 12.5 x64 system using the commands: + ./autogen.sh + # --enable-boot-time for Manjaro Linux + ./configure --disable-nls --enable-boot-time + make -j4 + cd grub-core + ../grub-mkimage -v -O i386-pc -d. -p\(hd0,msdos1\)/boot/grub biosdisk fat exfat ext2 ntfs ntfscomp part_msdos -o core.img + +* boot.img has been modified to nop the jump @ 0x66 as per grub2's setup.c comments: + /* If DEST_DRIVE is a hard disk, enable the workaround, which is + for buggy BIOSes which don't pass boot drive correctly. Instead, + they pass 0x00 or 0x01 even when booted from 0x80. */ + +* Note that, for convenience reasons, the content of boot.img is *not* the one that + Rufus processes when writing the MBR. + Instead, the byte array from src/ms-sys/inc/mbr_grub2.h (whose content is identical) + is what Rufus uses. If you modify these files, be mindful that you may also need + to update the array in mbr_grub2.h. + +* For details, see src/format.c, src/msys/br.c and src/msys/inc/mbr_grub2.h. \ No newline at end of file diff --git a/res/hogger/hogger.asm b/res/hogger/hogger.asm new file mode 100644 index 00000000..dbab990c --- /dev/null +++ b/res/hogger/hogger.asm @@ -0,0 +1,85 @@ + ; Rufus: The Reliable USB Formatting Utility + ; Commandline hogger, assembly version (NASM) + ; Copyright 2014 Pete Batard + ; + ; This program is free software: you can redistribute it and/or modify + ; it under the terms of the GNU General Public License as published by + ; the Free Software Foundation, either version 3 of the License, or + ; (at your option) any later version. + ; + ; This program is distributed in the hope that it will be useful, + ; but WITHOUT ANY WARRANTY; without even the implied warranty of + ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ; GNU General Public License for more details. + ; + ; You should have received a copy of the GNU General Public License + ; along with this program. If not, see . + + global _main + extern _GetStdHandle@4 + extern _OpenMutexA@12 + extern _WaitForSingleObject@8 + extern _WriteFile@20 + extern _ExitProcess@4 + + section .text +_main: + ; DWORD size; + mov ebp, esp + sub esp, 4 + + ; register HANDLE mutex [-> ecx], stdout [-> ebx]; + + ; stdout = GetStdHandle(STD_OUTPUT_HANDLE); + push -11 + call _GetStdHandle@4 + mov ebx, eax + + ; mutex = OpenMutexA(SYNCHRONIZE, FALSE, "Global/Rufus_CmdLine"); + push mutex_name + push 0 + push 1048576 ; 0x00100000 + call _OpenMutexA@12 + mov ecx, eax + + ; if (mutex == NULL) + test eax, eax + + ; goto error + je error + + ; WaitForSingleObject(mutex, INFINITE); + push -1 + push ecx + call _WaitForSingleObject@8 + + ; goto out; + jmp out; + + ; error: +error: + + ; WriteFile(stdout, error_msg, sizeof(error_msg), &size, 0); + push 0 + lea eax, [ebp-4] + push eax + push (error_msg_end - error_msg) + push error_msg + push ebx + call _WriteFile@20 + + ; out: +out: + + ; ExitProcess(0) + push 0 + call _ExitProcess@4 + + ; Just in case... + hlt + +mutex_name: + db "Global/Rufus_CmdLine",0 +error_msg: + db "Unable to synchronize with GUI application.",0 +error_msg_end: \ No newline at end of file diff --git a/res/hogger/hogger.c b/res/hogger/hogger.c new file mode 100644 index 00000000..a03b76ee --- /dev/null +++ b/res/hogger/hogger.c @@ -0,0 +1,40 @@ +/* + * Rufus: The Reliable USB Formatting Utility + * Commandline hogger, C version + * Copyright 2014 Pete Batard + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +const char error_msg[] = "Unable to synchronize with UI application."; + +int __cdecl main(int argc_ansi, char** argv_ansi) +{ + DWORD size; + register HANDLE mutex, stdout; + stdout = GetStdHandle(STD_OUTPUT_HANDLE); + mutex = OpenMutexA(SYNCHRONIZE, FALSE, "Global/Rufus_CmdLine"); + if (mutex == NULL) + goto error; + WaitForSingleObject(mutex, INFINITE); + goto out; + +error: + WriteFile(stdout, error_msg, sizeof(error_msg), &size, 0); + +out: + ExitProcess(0); +} diff --git a/res/hogger/hogger.exe b/res/hogger/hogger.exe new file mode 100644 index 00000000..6ca64e8a Binary files /dev/null and b/res/hogger/hogger.exe differ diff --git a/res/hogger/readme.txt b/res/hogger/readme.txt new file mode 100644 index 00000000..17a3fed6 --- /dev/null +++ b/res/hogger/readme.txt @@ -0,0 +1,69 @@ +Rufus: The Reliable USB Formatting Utility - Commandline hogger + +# Description + +This little utility is intended to solve the issue of Windows applications not +being able to be BOTH console and GUI [1], leading to all kind of annoyances [2]. + +The basic problem is as follows: + +1. You have an awesome Windows UI application that you want your users to be + able to start from the commandline (to provide parameters, etc.) +2. If an application is set to operate in UI mode, then when you launch it from + the command line, you will NOT get a command prompt freeze until it exits, as + you'd expect from any console app, but instead the prompt will return to the + user right away. +3. This means that any message that you try to output from your app to the + console will appear as ugly as: + C:\Some\Directory> Some Application Message +4. Another unfortunate effect is that, when users exit your app, they might + continue to wait for the prompt to come back, when it is already available + whilst polluted by output that looks out of place => Your user experience is + now subpar... +5. To compensate for this, you might try to be (somewhat) clever, through the + simulating an keypress when your app exit, but lo and behold, soon + enough you start receiving complaints left and right from Far Manager [3] + users, due to the fact that this application uses the keypress as an + "I want to launch the currently selected app" event. +6. HEY, MICROSOFT, THIS SUPER-SUCKS!!!! + +# Primer + +So, how far do we need to go to address this? + +1. We'll create a console hogger application, that does just what you'd expect + a regular commandline app to do (hog the console prompt until the app exits) + and wait for a signal (Mutex) from the UI app to indicate that it is closed. +2. We'll embed this console hogger as a resource in our app, to be extracted + and run in the current directory whenever we detect that our UI app has + been launched from the commandline +3. Because we want this annoyance to have the least impact possible, we'll + make sure that it is AS SMALL AS POSSIBLE, by writing it in pure assembly + so that we can compile it with NASM and linking it with WDK, leaving us + with a 2 KB executable (that will further be compressed to about 1/4th of + this size through UPX/LZMA). + +# Drawbacks + +The one annoyance with this workaround is that our 'hogger' will appear in the +command history (doskey). This means that when when a user wants to navigate +back to the command they launched, they need to skip through an extra entry, +which they probably have no idea about. And of course, doskey does not provide +the ability to suppress this last entry. + +Oh, and you also need to release the mutex so that you can delete the file +before you exit, though that's not a big deal... + +# Compilation + +; From a WDK command prompt + +nasm -fwin32 hogger.asm + +link /subsystem:console /nodefaultlib /entry:main hogger.obj %SDK_LIB_DEST%\i386\kernel32.lib + +# Links + +[1] http://blogs.msdn.com/b/oldnewthing/archive/2009/01/01/9259142.aspx +[2] https://github.com/pbatard/rufus/issues/161 +[3] http://www.farmanager.com/ diff --git a/res/icon-set/rufus-128.png b/res/icon-set/rufus-128.png deleted file mode 100644 index 4f5cca11..00000000 Binary files a/res/icon-set/rufus-128.png and /dev/null differ diff --git a/res/icon-set/rufus-16.png b/res/icon-set/rufus-16.png deleted file mode 100644 index 4d4316af..00000000 Binary files a/res/icon-set/rufus-16.png and /dev/null differ diff --git a/res/icon-set/rufus-24.png b/res/icon-set/rufus-24.png deleted file mode 100644 index a0aa33f1..00000000 Binary files a/res/icon-set/rufus-24.png and /dev/null differ diff --git a/res/icon-set/rufus-256.png b/res/icon-set/rufus-256.png deleted file mode 100644 index aa9dbf11..00000000 Binary files a/res/icon-set/rufus-256.png and /dev/null differ diff --git a/res/icon-set/rufus-32.png b/res/icon-set/rufus-32.png deleted file mode 100644 index 9174ef9c..00000000 Binary files a/res/icon-set/rufus-32.png and /dev/null differ diff --git a/res/icon-set/rufus-48.png b/res/icon-set/rufus-48.png deleted file mode 100644 index 7e26ced9..00000000 Binary files a/res/icon-set/rufus-48.png and /dev/null differ diff --git a/res/icon-set/rufus-64.png b/res/icon-set/rufus-64.png deleted file mode 100644 index 38255161..00000000 Binary files a/res/icon-set/rufus-64.png and /dev/null differ diff --git a/res/icon-set/rufus-72.png b/res/icon-set/rufus-72.png deleted file mode 100644 index 2e6b9666..00000000 Binary files a/res/icon-set/rufus-72.png and /dev/null differ diff --git a/res/icons/hash-16.png b/res/icons/hash-16.png new file mode 100644 index 00000000..48ef2599 Binary files /dev/null and b/res/icons/hash-16.png differ diff --git a/res/icons/hash-24.png b/res/icons/hash-24.png new file mode 100644 index 00000000..309aa7cc Binary files /dev/null and b/res/icons/hash-24.png differ diff --git a/res/icons/hash-32.png b/res/icons/hash-32.png new file mode 100644 index 00000000..82191288 Binary files /dev/null and b/res/icons/hash-32.png differ diff --git a/res/icons/info-16.png b/res/icons/info-16.png new file mode 100644 index 00000000..1e543315 Binary files /dev/null and b/res/icons/info-16.png differ diff --git a/res/icons/info-24.png b/res/icons/info-24.png new file mode 100644 index 00000000..ee87e5c9 Binary files /dev/null and b/res/icons/info-24.png differ diff --git a/res/icons/info-32.png b/res/icons/info-32.png new file mode 100644 index 00000000..4f79aad4 Binary files /dev/null and b/res/icons/info-32.png differ diff --git a/res/icons/lang-16.png b/res/icons/lang-16.png new file mode 100644 index 00000000..7cf1e61d Binary files /dev/null and b/res/icons/lang-16.png differ diff --git a/res/icons/lang-24.png b/res/icons/lang-24.png new file mode 100644 index 00000000..bd0ba50e Binary files /dev/null and b/res/icons/lang-24.png differ diff --git a/res/icons/lang-32.png b/res/icons/lang-32.png new file mode 100644 index 00000000..2f506a3b Binary files /dev/null and b/res/icons/lang-32.png differ diff --git a/res/icons/license.txt b/res/icons/license.txt new file mode 100644 index 00000000..4d78ab29 --- /dev/null +++ b/res/icons/license.txt @@ -0,0 +1,15 @@ +Please note the following licensing information for the icons: + +o rufus*.* - Public Domain, courtesy of PC Unleashed + http://pcunleashed.com + +o hash-*.png, info-*.png, lang-*.png, log-*.png, save-*.png, settings-*.png + From Axialis Fluent Pro 2018 Icon Set + CC BY-ND 4.0 when used as native resolution bitmaps, Commercial License otherwise + See https://www.axialis.com/icongenerator/iconset-license.html#free + +NB: To be on the safe side with regards to icon use and redistribution, we + did purchase a Commercial License for the Axialis icons. + If you are planning to use these icons outside of this project, you may + need to contact Axialis Software to clarify the extent to which you are + legally entitled to do so. diff --git a/res/icons/log-16.png b/res/icons/log-16.png new file mode 100644 index 00000000..3d601aeb Binary files /dev/null and b/res/icons/log-16.png differ diff --git a/res/icons/log-24.png b/res/icons/log-24.png new file mode 100644 index 00000000..3f394be2 Binary files /dev/null and b/res/icons/log-24.png differ diff --git a/res/icons/log-32.png b/res/icons/log-32.png new file mode 100644 index 00000000..00a9a306 Binary files /dev/null and b/res/icons/log-32.png differ diff --git a/res/icons/log.svg b/res/icons/log.svg new file mode 100644 index 00000000..91bf4a83 --- /dev/null +++ b/res/icons/log.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/res/icons/rufus-128.png b/res/icons/rufus-128.png new file mode 100644 index 00000000..7ffae0a7 Binary files /dev/null and b/res/icons/rufus-128.png differ diff --git a/res/icons/rufus-150.png b/res/icons/rufus-150.png new file mode 100644 index 00000000..720eee04 Binary files /dev/null and b/res/icons/rufus-150.png differ diff --git a/res/icons/rufus-16.png b/res/icons/rufus-16.png new file mode 100644 index 00000000..60c00863 Binary files /dev/null and b/res/icons/rufus-16.png differ diff --git a/res/icons/rufus-24.png b/res/icons/rufus-24.png new file mode 100644 index 00000000..bd7fe174 Binary files /dev/null and b/res/icons/rufus-24.png differ diff --git a/res/icons/rufus-256.png b/res/icons/rufus-256.png new file mode 100644 index 00000000..66b573b5 Binary files /dev/null and b/res/icons/rufus-256.png differ diff --git a/res/icons/rufus-32.png b/res/icons/rufus-32.png new file mode 100644 index 00000000..ca609261 Binary files /dev/null and b/res/icons/rufus-32.png differ diff --git a/res/icons/rufus-44.png b/res/icons/rufus-44.png new file mode 100644 index 00000000..caaae40f Binary files /dev/null and b/res/icons/rufus-44.png differ diff --git a/res/icons/rufus-48.png b/res/icons/rufus-48.png new file mode 100644 index 00000000..dd3db636 Binary files /dev/null and b/res/icons/rufus-48.png differ diff --git a/res/icons/rufus-512.png b/res/icons/rufus-512.png new file mode 100644 index 00000000..2f2fcb8b Binary files /dev/null and b/res/icons/rufus-512.png differ diff --git a/res/icons/rufus-64.png b/res/icons/rufus-64.png new file mode 100644 index 00000000..b2be43f5 Binary files /dev/null and b/res/icons/rufus-64.png differ diff --git a/res/icons/rufus-72.png b/res/icons/rufus-72.png new file mode 100644 index 00000000..5e2fd763 Binary files /dev/null and b/res/icons/rufus-72.png differ diff --git a/res/icon-set/rufus.ico b/res/icons/rufus.ico similarity index 100% rename from res/icon-set/rufus.ico rename to res/icons/rufus.ico diff --git a/res/icons/save-16.png b/res/icons/save-16.png new file mode 100644 index 00000000..d54b5eed Binary files /dev/null and b/res/icons/save-16.png differ diff --git a/res/icons/save-24.png b/res/icons/save-24.png new file mode 100644 index 00000000..63c70e55 Binary files /dev/null and b/res/icons/save-24.png differ diff --git a/res/icons/save-32.png b/res/icons/save-32.png new file mode 100644 index 00000000..7ce6133c Binary files /dev/null and b/res/icons/save-32.png differ diff --git a/res/icons/settings-16.png b/res/icons/settings-16.png new file mode 100644 index 00000000..2548809c Binary files /dev/null and b/res/icons/settings-16.png differ diff --git a/res/icons/settings-24.png b/res/icons/settings-24.png new file mode 100644 index 00000000..6ac7971e Binary files /dev/null and b/res/icons/settings-24.png differ diff --git a/res/icons/settings-32.png b/res/icons/settings-32.png new file mode 100644 index 00000000..b16e4747 Binary files /dev/null and b/res/icons/settings-32.png differ diff --git a/res/loc/ChangeLog.txt b/res/loc/ChangeLog.txt new file mode 100644 index 00000000..072325df --- /dev/null +++ b/res/loc/ChangeLog.txt @@ -0,0 +1,416 @@ +This file lists all the changes that have been applied to the en-US translation of +rufus.loc since its original version. + +To edit a translation, please make sure to follow: +https://github.com/pbatard/rufus/wiki/Localization#Editing_an_existing_translation +Or simply download https://files.akeo.ie/pollock/pollock-1.5.exe and follow its directions. + +o v4.5 (2024.05.??) + - *UPDATED* IDC_RUFUS_MBR -> IDC_UEFI_MEDIA_VALIDATION "Enable runtime UEFI media validation" + - *UPDATED* MSG_167 "Install a UEFI bootloader, that will perform MD5Sum file validation of the media" + - *NEW* MSG_337 "An additional file ('diskcopy.dll') must be downloaded from Microsoft to install MS-DOS (...)" + - *NEW* MSG_338 "Revoked UEFI bootloader detected" + - *NEW* MSG_339 "Rufus detected that the ISO you have selected contains a UEFI bootloader that has been revoked (...)" + - *NEW* MSG_340 "a \"Security Violation\" screen" + - *NEW* MSG_341 "a Windows Recovery Screen (BSOD) with '%s'" + - *NEW MSG_342 "Compressed VHDX Image" + - *NEW* MSG_343 "Uncompressed VHD Image" + - *NEW* MSG_344 "Full Flash Update Image" + - *NEW* MSG_345 "Some additional data must be downloaded from Microsoft to use this functionality (...)" + - *NEW* MSG_346 "Restrict Windows to S-Mode (INCOMPATIBLE with online account bypass)" + - *NEW* MSG_347 "Expert Mode" + - *NEW* MSG_348 "Extracting archive files: %s" + - *NEW* MSG_349 "Use Rufus MBR" + +o v3.22 (2023.03.25) + // MSG_144 is aimed the the ISO download feature + - *UPDATED* MSG_144 "Temporarily banned by Microsoft for requesting too many downloads (...)" -> "Download of Windows ISOs is unavailable due to Microsoft having altered their website to prevent it." + // MSG_199 will appear for the ISO download feature if running on Windows 7 + - *NEW* MSG_199 "This feature is not available on this platform." + // MSG_294 can be tested by launching Rufus from the commandline with option -z61 + - *UPDATED* MSG_294 "This version of Windows is no longer supported by Rufus." -> added "\nThe last version of Rufus compatible with this platform is v%d.%d." + - *NEW* MSG_323 "Unable to open or read '%s'" + // MSG_325 appears on the status bar when creating a customized Windows 10 or Windows 11 media + - *NEW* MSG_325 "Applying Windows customization: %s" + // The following messages appear after selecting a Windows 11 ISO and pressing START + - *NEW* MSG_326 "Windows User Experience" + - *NEW* MSG_327 "Customize Windows installation?" + - *NEW* MSG_328 "Remove requirement for Secure Boot and TPM 2.0" + - *NEW* MSG_329 "Remove requirement for 4GB+ RAM and 64GB+ disk" + - *NEW* MSG_330 "Remove requirement for an online Microsoft account" + - *NEW* MSG_331 "Disable data collection (Skip privacy questions)" + - *NEW* MSG_332 "Prevent Windows To Go from accessing internal disks" + - *NEW* MSG_333 "Create a local account with username:" + - *NEW* MSG_334 "Set regional options to the same values as this user's" + - *NEW* MSG_335 "Disable BitLocker automatic device encryption" + // MSG_336 can be tested with -

+ - *NEW* MSG_336 "Persistent log" + // The following messages are used for the Windows Store listing at https://apps.microsoft.com/store/detail/rufus/9PC3H3V7Q9CH + - *NEW* MSG_900 "Rufus is a utility that helps format and create bootable USB flash drives, such as USB keys/pendrives, memory sticks, etc." + - *NEW* MSG_901 "Official site: %s" + - *NEW* MSG_902 "Source Code: %s" + - *NEW* MSG_903 "ChangeLog: %s" + // The gnu.org website has many translations of the GPL (such as https://www.gnu.org/licenses/gpl-3.0.zh-cn.html, https://www.gnu.org/licenses/gpl-3.0.fr.html) + // Please make sure you try to locate the relevant https://www.gnu.org/licenses/gpl-3.0..html for your language and use it below. + - *NEW* MSG_904 "This application is licensed under the terms of the GNU Public License (GPL) version 3.\nSee https://www.gnu.org/licenses/gpl-3.0.en.html for details" + // Keyword for "boot" that can be used for search in the Windows Store + - *NEW* MSG_905 "Boot" + // This and subsequent messages will be listed in the 'Features' section of the Windows Store page + - *NEW* MSG_910 "Format USB, flash card and virtual drives to FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3" + - *NEW* MSG_911 "Create FreeDOS bootable USB drives" + - *NEW* MSG_912 "Create bootable drives from bootable ISOs (Windows, Linux, etc.)" + - *NEW* MSG_913 "Create bootable drives from bootable disk images, including compressed ones" + - *NEW* MSG_914 "Create BIOS or UEFI bootable drives, including UEFI bootable NTFS" + - *NEW* MSG_915 "Create 'Windows To Go' drives" + - *NEW* MSG_916 "Create Windows 11 installation drives for PCs that don't have TPM or Secure Boot" + - *NEW* MSG_917 "Create persistent Linux partitions" + - *NEW* MSG_918 "Create a VHD/DD image of a drive" + - *NEW* MSG_919 "Compute MD5, SHA-1, SHA-256 and SHA-512 checksums of the selected image" + - *NEW* MSG_920 "Perform bad blocks checks, including detection of \"fake\" flash drives" + - *NEW* MSG_921 "Download official Microsoft Windows retail ISOs" + - *NEW* MSG_922 "Download UEFI Shell ISOs" + +o v3.14 (2021.03.31) + - *UPDATED* MSG_068 "Error while partitioning drive." -> "Could not partition drive." + - *UPDATED* MSG_274 "IsoHybrid image detected" -> "%s image detected" + // MSG_308 can be tested with - + - *NEW* MSG_308 "VHD detection" + // MSG_309 can be seen in the file selection dialog *after* having selected an ISO (e.g. esp_test.iso below) + // and pressing -