build: include manifests in .rc files

configure.ac

@@ -980,6 +980,15 @@ if test "${enable_sm}" = "yes"; then
  esac
 fi
 
+case "${host}" in
+ *-winnt*|*-cygwin*)
+ win_abs_top_srcdir="$(cygpath --windows $(realpath ${srcdir}))"
+ ;;
+ *)
+ win_abs_top_srcdir="$(realpath ${srcdir})"
+ ;;
+esac
+
 if test "${with_pkcs11_provider}" = "detect"; then
  if test "${WIN32}" != "yes"; then
  DEFAULT_PKCS11_PROVIDER="${libdir}/opensc-pkcs11${DYN_LIB_EXT}"
@@ -1126,6 +1135,7 @@ AC_SUBST([PROFILE_DIR_DEFAULT])
 AC_SUBST([OPTIONAL_NOTIFY_CFLAGS])
 AC_SUBST([OPTIONAL_NOTIFY_LIBS])
 AC_SUBST([TIDY_CHECKS])
+AC_SUBST([win_abs_top_srcdir])
 
 AM_CONDITIONAL([ENABLE_MAN], [test "${enable_man}" = "yes"])
 AM_CONDITIONAL([ENABLE_THREAD_LOCKING], [test "${enable_thread_locking}" = "yes"])
@@ -1173,27 +1183,29 @@ AC_CONFIG_FILES([
  src/common/Makefile
  src/ui/Makefile
  src/libopensc/Makefile
+ src/libopensc/libopensc.rc
  src/sm/Makefile
  src/pkcs11/Makefile
- src/pkcs11/versioninfo-pkcs11.rc
- src/pkcs11/versioninfo-pkcs11-spy.rc
+ src/pkcs11/opensc-pkcs11.rc
+ src/pkcs11/opensc-pkcs11-spy.rc
  src/pkcs11/opensc-pkcs11.pc
  src/pkcs15init/Makefile
  src/scconf/Makefile
  src/tests/Makefile
+ src/tests/tests.rc
  src/tests/regression/Makefile
  src/tests/p11test/Makefile
  src/tests/fuzzing/Makefile
  src/tests/unittests/Makefile
  src/tools/Makefile
- src/tools/versioninfo-tools.rc
- src/tools/versioninfo-opensc-notify.rc
+ src/tools/tools.rc
+ src/tools/opensc-notify-x.rc
  src/smm/Makefile
+ src/smm/smm-local.rc
  src/minidriver/Makefile
- src/minidriver/versioninfo-minidriver.rc
+ src/minidriver/opensc-minidriver.rc
  src/minidriver/opensc-minidriver.inf
  win32/Makefile
- win32/versioninfo.rc
  win32/versioninfo-customactions.rc
  win32/winconfig.h
  win32/OpenSC.iss

src/libopensc/Makefile.am

@@ -74,7 +74,7 @@ libopensc_la_SOURCES = $(libopensc_la_SOURCES_BASE) \
 libopensc_static_la_SOURCES = $(libopensc_la_SOURCES_BASE)
 
 if WIN32
-libopensc_la_SOURCES += $(top_builddir)/win32/versioninfo.rc
+libopensc_la_SOURCES += libopensc.rc
 endif
 libopensc_la_LIBADD = $(OPENPACE_LIBS) $(OPTIONAL_OPENSSL_LIBS) \
  $(OPTIONAL_OPENCT_LIBS) $(OPTIONAL_ZLIB_LIBS) \

src/libopensc/Makefile.mak

@@ -38,7 +38,7 @@ OBJECTS = \
  pkcs15-esteid2018.obj pkcs15-idprime.obj pkcs15-nqApplet.obj \
  pkcs15-starcos-esign.obj pkcs15-skeid.obj pkcs15-eoi.obj compression.obj sm.obj \
  aux-data.obj \
- $(TOPDIR)\win32\versioninfo.res
+ libopensc.res
 LIBS = $(TOPDIR)\src\scconf\scconf.lib \
  $(TOPDIR)\src\common\common.lib \
  $(TOPDIR)\src\common\libscdl.lib \
@@ -48,7 +48,7 @@ LIBS = $(TOPDIR)\src\scconf\scconf.lib \
  $(TOPDIR)\src\sm\libsmeac.lib \
  $(TOPDIR)\src\pkcs15init\pkcs15init.lib
 
-all: $(TOPDIR)\win32\versioninfo.res $(TARGET)
+all: libopensc.res $(TARGET)
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
@@ -57,7 +57,6 @@ opensc.dll: $(OBJECTS) $(LIBS)
  echo EXPORTS >> $*.def
  type lib$*.exports >> $*.def
  link $(LINKFLAGS) /dll /def:$*.def /implib:$*.lib /out:opensc.dll $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib Comctl32.lib Shell32.lib user32.lib advapi32.lib ws2_32.lib shlwapi.lib
- if EXIST opensc.dll.manifest mt -manifest opensc.dll.manifest -outputresource:opensc.dll;2
 
 opensc_a.lib: $(OBJECTS)
  lib $(LIBFLAGS) /out:opensc_a.lib $(OBJECTS)

src/minidriver/versioninfo-minidriver.rc.in → src/libopensc/libopensc.rc.in

@@ -1,15 +1,5 @@
 #include <winresrc.h>
 
-#define IDC_STATIC -1
-/* defined twice: in resource file and in source code */
-#define IDI_SMARTCARD 102
-
-#ifndef __MINGW32__
-IDI_SMARTCARD ICON "..\\..\\win32\\DDORes.dll_14_2302.ico"
-#else
-IDI_SMARTCARD ICON "../../win32/DDORes.dll_14_2302.ico"
-#endif
-
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
  PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
@@ -37,11 +27,17 @@ BEGIN
  VALUE "ProductName", "@OPENSC_VS_FF_PRODUCT_NAME@"
  VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
  VALUE "SpecialBuild", ""
- VALUE "FileDescription", "OpenSC minidriver"
+ VALUE "FileDescription", "OpenSC internal library"
  END
  END
  BLOCK "VarFileInfo"
  BEGIN
  VALUE "Translation", 0x409, 1200
  END
 END
+
+#ifndef __MINGW32__
+2 RT_MANIFEST "@win_abs_top_srcdir@\\src\\libopensc\\opensc.dll.manifest"
+#else
+2 RT_MANIFEST "@win_abs_top_srcdir@/src/libopensc/opensc.dll.manifest"
+#endif

src/minidriver/Makefile.am

@@ -1,7 +1,7 @@
 include $(top_srcdir)/win32/ltrc.inc
 
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo-minidriver.rc
-EXTRA_DIST = Makefile.mak versioninfo-minidriver.rc.in opensc-minidriver.dll.manifest
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/opensc-minidriver.rc
+EXTRA_DIST = Makefile.mak opensc-minidriver.rc.in opensc-minidriver.dll.manifest
 
 if ENABLE_MINIDRIVER
 lib_LTLIBRARIES = opensc-minidriver@[email protected]
@@ -15,7 +15,7 @@ endif
 AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPENPACE_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-opensc_minidriver@LIBRARY_BITNESS@_la_SOURCES = minidriver.c minidriver.exports versioninfo-minidriver.rc
+opensc_minidriver@LIBRARY_BITNESS@_la_SOURCES = minidriver.c minidriver.exports opensc-minidriver.rc
 opensc_minidriver@LIBRARY_BITNESS@_la_LIBADD = \
  $(top_builddir)/src/libopensc/libopensc_static.la \
  $(OPTIONAL_OPENSSL_LIBS) \

src/minidriver/Makefile.mak

@@ -1,7 +1,7 @@
 TOPDIR = ..\..
 
 TARGET = opensc-minidriver.dll
-OBJECTS = minidriver.obj versioninfo-minidriver.res
+OBJECTS = minidriver.obj opensc-minidriver.res
 LIBS = $(TOPDIR)\src\libopensc\opensc_a.lib \
  $(TOPDIR)\src\scconf\scconf.lib \
  $(TOPDIR)\src\common\common.lib \
@@ -21,4 +21,3 @@ $(TARGET): $(OBJECTS) $(LIBS)
  echo EXPORTS >> $*.def
  type minidriver.exports >> $*.def
  link /dll $(LINKFLAGS) /def:$*.def /out:$(TARGET) $(OBJECTS) $(LIBS) $(ZLIB_LIB) $(OPENPACE_LIB) $(OPENSSL_LIB) ws2_32.lib gdi32.lib Comctl32.lib advapi32.lib Crypt32.lib User32.lib bcrypt.lib DelayImp.lib Rpcrt4.lib Shell32.lib Comctl32.lib Winmm.lib shlwapi.lib /DELAYLOAD:bcrypt.dll
- if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2

src/minidriver/opensc-minidriver.rc.in

@@ -0,0 +1,53 @@
+#include <winresrc.h>
+
+#define IDC_STATIC -1
+/* defined twice: in resource file and in source code */
+#define IDI_SMARTCARD 102
+
+#ifndef __MINGW32__
+IDI_SMARTCARD ICON "@win_abs_top_srcdir@\\win32\\DDORes.dll_14_2302.ico"
+#else
+IDI_SMARTCARD ICON "@win_abs_top_srcdir@/win32/DDORes.dll_14_2302.ico"
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+ PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x21L
+#else
+ FILEFLAGS 0x20L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "@OPENSC_VS_FF_COMMENTS@"
+ VALUE "CompanyName", "@OPENSC_VS_FF_COMPANY_NAME@"
+ VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
+ VALUE "InternalName", "@PACKAGE_NAME@"
+ VALUE "LegalCopyright", "@OPENSC_VS_FF_LEGAL_COPYRIGHT@"
+ VALUE "LegalTrademarks", ""
+ VALUE "PrivateBuild", ""
+ VALUE "ProductName", "@OPENSC_VS_FF_PRODUCT_NAME@"
+ VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
+ VALUE "SpecialBuild", ""
+ VALUE "FileDescription", "OpenSC minidriver"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#ifndef __MINGW32__
+2 RT_MANIFEST "@win_abs_top_srcdir@\\src\\minidriver\\opensc-minidriver.dll.manifest"
+#else
+2 RT_MANIFEST "@win_abs_top_srcdir@/src/minidriver/opensc-minidriver.dll.manifest"
+#endif

src/pkcs11/Makefile.am

@@ -1,7 +1,7 @@
 include $(top_srcdir)/win32/ltrc.inc
 
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo-pkcs11.rc $(srcdir)/versioninfo-pkcs11-spy.rc
-EXTRA_DIST = Makefile.mak versioninfo-pkcs11.rc.in versioninfo-pkcs11-spy.rc.in opensc-pkcs11.pc.in opensc-pkcs11.dll.manifest
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/opensc-pkcs11.rc $(srcdir)/opensc-pkcs11-spy.rc
+EXTRA_DIST = Makefile.mak opensc-pkcs11.rc.in opensc-pkcs11-spy.rc.in opensc-pkcs11.pc.in opensc-pkcs11.dll.manifest
 
 if ENABLE_SHARED
 lib_LTLIBRARIES = opensc-pkcs11.la pkcs11-spy.la
@@ -55,8 +55,8 @@ pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
  -module -shared -avoid-version -no-undefined
 
 if WIN32
-opensc_pkcs11_la_SOURCES += versioninfo-pkcs11.rc
-pkcs11_spy_la_SOURCES += versioninfo-pkcs11-spy.rc
+opensc_pkcs11_la_SOURCES += opensc-pkcs11.rc
+pkcs11_spy_la_SOURCES += opensc-pkcs11-spy.rc
 pkcs11_spy_la_LIBADD += -lshlwapi
 endif
 

src/pkcs11/Makefile.mak

@@ -5,8 +5,8 @@ TARGET3 = pkcs11-spy.dll
 
 OBJECTS = pkcs11-global.obj pkcs11-session.obj pkcs11-object.obj misc.obj slot.obj \
  mechanism.obj openssl.obj framework-pkcs15.obj framework-pkcs15init.obj \
- debug.obj pkcs11-display.obj versioninfo-pkcs11.res
-OBJECTS3 = pkcs11-spy.obj pkcs11-display.obj versioninfo-pkcs11-spy.res
+ debug.obj pkcs11-display.obj opensc-pkcs11.res
+OBJECTS3 = pkcs11-spy.obj pkcs11-display.obj opensc-pkcs11-spy.res
 
 LIBS = $(TOPDIR)\src\libopensc\opensc_a.lib \
  $(TOPDIR)\src\pkcs15init\pkcs15init.lib \
@@ -26,8 +26,6 @@ all: $(TARGET1) $(TARGET3)
 
 $(TARGET1): $(OBJECTS) $(LIBS)
  link $(LINKFLAGS) /dll /implib:$*.lib /out:$(TARGET1) $(OBJECTS) $(LIBS) $(OPENPACE_LIB) $(OPENSSL_LIB) $(ZLIB_LIB) gdi32.lib Comctl32.lib Shell32.lib user32.lib advapi32.lib ws2_32.lib Shell32.lib Comctl32.lib shlwapi.lib
- if EXIST $(TARGET1).manifest mt -manifest $(TARGET1).manifest -outputresource:$(TARGET1);2
 
 $(TARGET3): $(OBJECTS3) $(LIBS3)
  link $(LINKFLAGS) /dll /implib:$*.lib /out:$(TARGET3) $(OBJECTS3) $(LIBS3) $(OPENSSL_LIB) gdi32.lib advapi32.lib shlwapi.lib
- if EXIST $(TARGET3).manifest mt -manifest $(TARGET3).manifest -outputresource:$(TARGET3);2

src/pkcs11/versioninfo-pkcs11.rc.in → src/pkcs11/opensc-pkcs11.rc.in

@@ -36,3 +36,8 @@ BEGIN
  END
 END
 
+#ifndef __MINGW32__
+2 RT_MANIFEST "@win_abs_top_srcdir@\\src\\pkcs11\\opensc-pkcs11.dll.manifest"
+#else
+2 RT_MANIFEST "@win_abs_top_srcdir@/src/pkcs11/opensc-pkcs11.dll.manifest"
+#endif

src/smm/Makefile.am

@@ -2,7 +2,7 @@
 
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = Makefile.mak smm-local.dll.manifest
+EXTRA_DIST = Makefile.mak smm-local.rc.in smm-local.dll.manifest
 
 AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
@@ -20,6 +20,9 @@ libsmm_local_la_SOURCES = smm-local.c sm-module.h \
  sm-global-platform.c sm-cwa14890.c \
  sm-card-authentic.c sm-card-iasecc.c \
  smm-local.exports
+if WIN32
+libsmm_local_la_SOURCES += smm-local.rc
+endif
 libsmm_local_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS)
 libsmm_local_la_LDFLAGS = -module -shared -no-undefined -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@
 

src/smm/Makefile.mak

@@ -2,7 +2,7 @@ TOPDIR = ..\..
 
 TARGET = smm-local.dll
 
-OBJECTS = smm-local.obj sm-global-platform.obj sm-cwa14890.obj sm-card-iasecc.obj sm-card-authentic.obj
+OBJECTS = smm-local.obj sm-global-platform.obj sm-cwa14890.obj sm-card-iasecc.obj sm-card-authentic.obj smm-local.res
 LIBS = $(TOPDIR)\src\sm\libsm.lib \
  $(TOPDIR)\src\libopensc\opensc_a.lib \
  $(TOPDIR)\src\pkcs15init\pkcs15init.lib \
@@ -15,7 +15,7 @@ LIBS = $(TOPDIR)\src\sm\libsm.lib \
  $(TOPDIR)\src\sm\libsmeac.lib \
  $(TOPDIR)\src\pkcs15init\pkcs15init.lib
 
-all: $(TARGET)
+all: smm-local.res $(TARGET)
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
@@ -25,7 +25,6 @@ $(TARGET): $(OBJECTS) $(LIBS)
  echo EXPORTS >> $*.def
  type $*.exports >> $*.def
  link /dll $(LINKFLAGS) /def:$*.def /out:$(TARGET) $(OBJECTS) $(LIBS) $(ZLIB_LIB) $(OPENPACE_LIB) $(OPENSSL_LIB) ws2_32.lib gdi32.lib advapi32.lib Crypt32.lib User32.lib Shell32.lib Comctl32.lib shlwapi.lib
- if EXIST $(TARGET).manifest mt -manifest $(TARGET).manifest -outputresource:$(TARGET);2
 
 !ELSE
 $(TARGET):

src/smm/smm-local.rc.in

@@ -0,0 +1,43 @@
+#include <winresrc.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+ PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x21L
+#else
+ FILEFLAGS 0x20L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "@OPENSC_VS_FF_COMMENTS@"
+ VALUE "CompanyName", "@OPENSC_VS_FF_COMPANY_NAME@"
+ VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
+ VALUE "InternalName", "@PACKAGE_NAME@"
+ VALUE "LegalCopyright", "@OPENSC_VS_FF_LEGAL_COPYRIGHT@"
+ VALUE "LegalTrademarks", ""
+ VALUE "PrivateBuild", ""
+ VALUE "ProductName", "@OPENSC_VS_FF_PRODUCT_NAME@"
+ VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
+ VALUE "SpecialBuild", ""
+ VALUE "FileDescription", "OpenSC secure messaging module"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#ifndef __MINGW32__
+2 RT_MANIFEST "@win_abs_top_srcdir@\\src\\smm\\smm-local.dll.manifest"
+#else
+2 RT_MANIFEST "@win_abs_top_srcdir@/src/smm/smm-local.dll.manifest"
+#endif

src/tests/Makefile.am

@@ -1,7 +1,7 @@
 include $(top_srcdir)/win32/ltrc.inc
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-EXTRA_DIST = Makefile.mak
+EXTRA_DIST = Makefile.mak tests.rc.in tests.manifest
 
 SUBDIRS = regression p11test fuzzing unittests
 noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
@@ -23,9 +23,9 @@ pintest_SOURCES = pintest.c print.c $(COMMON_SRC) $(COMMON_INC)
 prngtest_SOURCES = prngtest.c $(COMMON_SRC) $(COMMON_INC)
 
 if WIN32
-base64_SOURCES += $(top_builddir)/win32/versioninfo.rc
-lottery_SOURCES += $(top_builddir)/win32/versioninfo.rc
-p15dump_SOURCES += $(top_builddir)/win32/versioninfo.rc
-pintest_SOURCES += $(top_builddir)/win32/versioninfo.rc
-prngtest_SOURCES += $(top_builddir)/win32/versioninfo.rc
+base64_SOURCES += tests.rc
+lottery_SOURCES += tests.rc
+p15dump_SOURCES += tests.rc
+pintest_SOURCES += tests.rc
+prngtest_SOURCES += tests.rc
 endif

src/tests/Makefile.mak

@@ -3,7 +3,7 @@ TOPDIR = ..\..
 TARGETS = base64.exe p15dump.exe opensc-minidriver-test.exe \
  p15dump.exe pintest.exe # prngtest.exe lottery.exe
 
-OBJECTS = print.obj sc-test.obj $(TOPDIR)\win32\versioninfo.res
+OBJECTS = print.obj sc-test.obj tests.res
 LIBS = $(TOPDIR)\src\common\common.lib $(TOPDIR)\src\libopensc\opensc.lib
 
 all: $(TARGETS)
@@ -15,9 +15,7 @@ $(TARGETS): $(OBJECTS) $(LIBS)
 opensc-minidriver-test.exe:
  cl $(COPTS) /c $*.c
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj bcrypt.lib ncrypt.lib crypt32.lib winscard.lib
- if EXIST [email protected] mt -manifest [email protected] -outputresource:$@;1
 
 .c.exe:
  cl $(COPTS) /c $<
  link $(LINKFLAGS) /pdb:$*.pdb /out:$@ $*.obj $(OBJECTS) $(LIBS)
- if EXIST [email protected] mt -manifest [email protected] -outputresource:$@;1