AM_YFLAGS = -d
AM_LFLAGS = -8
WINDRES = @WINDRES@
-AM_CPPFLAGS = -DLZMA_API_STATIC -I$(srcdir)/libgetopt++/include
+AM_CPPFLAGS = -D__USE_MINGW_ANSI_STDIO=1 -DLZMA_API_STATIC\
+ -I$(srcdir)/libgetopt++/include \
+ $(ZLIB_CFLAGS) $(LZMA_CFLAGS) $(ZSTD_CFLAGS) $(LIBCRYPT_CFLAGS) $(LIBSOLV_CFLAGS)
inilex_CXXFLAGS:=-Wno-sign-compare
+iniparse_CXXFLAGS:=-Wno-free-nonheap-object
-noinst_PROGRAMS = @SETUP@$(EXEEXT) @INILINT@
-
-EXTRA_PROGRAMS = inilint
-## noinst_PROGRAMS +=inilint
+noinst_PROGRAMS = @SETUP@$(EXEEXT) inilint
EXTRA_DIST = \
CHANGES \
CONTRIBUTORS \
COPYING \
bootstrap.sh \
- check-na.bmp \
- check-no.bmp \
- check-yes.bmp \
- choose-rtarrow.bmp \
- choose-spin.bmp \
cygwin.ico \
cygwin-setup.ico \
cygwin-terminal.ico \
setup.exe.manifest \
- setup64.exe.manifest \
- tree-minus.bmp \
- tree-plus.bmp
+ tree-minus.ico \
+ tree-plus.ico
# iniparse.hh is generated from iniparse.yy via bison -d, so it needs to be
# included here for proper tracking (but not iniparse.cc, since automake
CLEANFILES = setup_version.c
inilint_LDADD = \
- libgetopt++/libgetopt++.la
+ libgetopt++/libgetopt++.la \
+ -lntdll -luuid
+
inilint_SOURCES = \
filemanip.cc \
filemanip.h \
- find.cc \
- find.h \
- FindVisitor.cc \
- FindVisitor.h \
+ CliParseFeedback.cc \
+ CliParseFeedback.h \
LogSingleton.cc \
LogSingleton.h \
IniDBBuilder.h \
inilintmain.cc \
inilex.ll \
iniparse.yy \
- IniParseFeedback.cc \
- IniParseFeedback.h \
- io_stream.h \
io_stream.cc \
- io_stream_file.h \
+ io_stream.h \
io_stream_file.cc \
- IOStreamProvider.h \
+ io_stream_file.h \
mkdir.cc \
mkdir.h \
mklink2.cc \
- PackageSpecification.cc \
- PackageSpecification.h \
+ mklink2.h \
PackageTrust.h \
- csu_util/rfc1738.cc \
- csu_util/rfc1738.h \
String++.cc \
- String++.h
+ String++.h \
+ win32.cc \
+ win32.h
@SETUP@_LDADD = \
- libgetopt++/libgetopt++.la -lgcrypt -lgpg-error -llzma -lbz2 -lz -lsolv -lregex \
- -lshlwapi -lcomctl32 -lole32 -lws2_32 -lpsapi -luuid -lntdll -lwininet -lmingw32
+ libgetopt++/libgetopt++.la \
+ $(LIBGCRYPT_LIBS) \
+ $(ZSTD_LIBS) \
+ $(LZMA_LIBS) \
+ $(BZ2_LIBS) \
+ $(ZLIB_LIBS) \
+ $(LIBSOLV_LIBS) -lregex \
+ -lshlwapi -lcomctl32 -lole32 -lpsapi -luuid -lntdll -lwininet -lws2_32 \
+ -lmingw32 -lssp
@SETUP@_LDFLAGS = -mwindows -Wc,-static -static-libtool-libs
@SETUP@_SOURCES = \
+ actionlist.h \
AntiVirus.cc \
AntiVirus.h \
archive.cc \
archive_tar_file.cc \
choose.cc \
choose.h \
+ compactos.cc \
+ compactos.h \
compress.cc \
compress.h \
compress_bz.cc \
compress_gz.h \
compress_xz.cc \
compress_xz.h \
+ compress_zstd.cc \
+ compress_zstd.h \
confirm.cc \
confirm.h \
ConnectionSetting.cc \
IniDBBuilderPackage.h \
inilex.ll \
iniparse.yy \
- IniParseFeedback.cc \
IniParseFeedback.h \
install.cc \
io_stream.cc \
KeysSetting.h \
libsolv.cc \
libsolv.h \
+ ListView.cc \
+ ListView.h \
localdir.cc \
localdir.h \
LogFile.cc \
netio.h \
nio-ie5.cc \
nio-ie5.h \
- nio-file.cc \
- nio-file.h \
- nio-ftp.cc \
- nio-ftp.h \
- nio-http.cc \
- nio-http.h \
package_db.cc \
package_db.h \
package_depends.h \
PackageTrust.h \
PickCategoryLine.cc \
PickCategoryLine.h \
- PickLine.h \
PickPackageLine.cc \
PickPackageLine.h \
PickView.cc \
setup_version.c \
sha2.h \
sha2.c \
- simpsock.cc \
- simpsock.h \
site.cc \
site.h \
source.cc \
csu_util/version_compare.cc \
csu_util/version_compare.h
-GITVER := $(shell cd $(srcdir) && git describe --match release_\* --abbrev=6 --dirty || "N/A")
+GITVER := $(shell cd $(srcdir) && git describe --match release_\* --abbrev=6 --dirty || echo "N/A")
VER := $(subst release_,,$(GITVER))
ARCH := @ARCH@
echo 'const char *setup_version = version_store + sizeof (VERSION_PREFIX);') > version.tmp && \
mv version.tmp setup_version.c
-# setup.exe.manifest is included in res.rc
-res.o: @SETUP@.exe.manifest
+# rules for translation maintenance
+.PHONY: pot rc2po po2rc
+
+pot:
+ cd $(srcdir) && rc2po -P res/en/res.rc res.pot
+
+LINGUAS=fr
+
+rc2po:
+ cd $(srcdir) && \
+ for l in $(LINGUAS) ; do \
+ rc2po -t res/en/res.rc --charset=utf-8 res/$$l/res.rc po/$$l/ ; \
+ done
+
+po2rc:
+ cd $(srcdir) && \
+ for l in $(LINGUAS) ; do \
+ po2rc -t res/en/res.rc --charset-output=utf-8 $$(./langopts $$l) po/$$l/ res/$$l && \
+ d2u -q res/$$l/res.rc ; \
+ done
+
+# files included by res.rc
+res.o: setup.exe.manifest res/en/res.rc $(foreach l,$(LINGUAS),res/$l/res.rc)
.rc.o:
- $(AM_V_GEN)$(WINDRES) --include-dir $(srcdir) -o $@ $<
+ $(AM_V_GEN)$(WINDRES) --codepage 65001 --include-dir $(srcdir) -o $@ $<
setup-src:
@ver=setup-$(VER);\
UPLOAD_HOST=cygwin-admin@cygwin.com
UPLOAD_PATH=/www/sourceware/htdocs/cygwin/setup
+SIGN_KEYS="--enable-dsa2 --personal-digest-preferences=sha256 -u 676041BA -u 1A698DE9E2E56300"
upload: release
scp setup-${VER}.$(ARCH).exe setup-${VER}.$(ARCH).dbg ${UPLOAD_HOST}:${UPLOAD_PATH}
- ssh ${UPLOAD_HOST} gpg --detach-sign ${UPLOAD_PATH}/setup-${VER}.$(ARCH).exe
+ ssh ${UPLOAD_HOST} gpg --batch ${SIGN_KEYS} --detach-sign ${UPLOAD_PATH}/setup-${VER}.$(ARCH).exe
clean-local:
rm -f setup*${EXEEXT} setup*.dbg
git://cygwin.com / cygwin-apps / setup.git / blobdiff