URL
https://opencores.org/ocsvn/phr/phr/trunk
Subversion Repositories phr
Compare Revisions
- This comparison shows the changes necessary to convert path
/phr/trunk/codigo/gui
- from Rev 337 to Rev 338
- ↔ Reverse comparison
Rev 337 → Rev 338
/linux/crear-lanzador.sh
0,0 → 1,18
#!/bin/bash |
|
IFS=$'\x0A'$'\x0D' |
|
lname=phr-gui-launcher.desktop |
|
dir=`pwd` |
|
echo "" > $lname |
echo "[Desktop Entry]" >> $lname |
echo "Name=PHR GUI v0.1" >> $lname |
echo "Type=Application" >> $lname |
echo "Exec=\"$dir/phr-gui.py\"" >> $lname |
echo "Icon=$dir/grafica/phr-gui-96.png" >> $lname |
|
chmod +x $lname |
chmod +x phr-gui.py |
|
linux/crear-lanzador.sh
Property changes :
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: phrgui-linux-0.1.1-r337.tar.gz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: phrgui-linux-0.1.1-r337.tar.gz
===================================================================
--- phrgui-linux-0.1.1-r337.tar.gz (nonexistent)
+++ phrgui-linux-0.1.1-r337.tar.gz (revision 338)
phrgui-linux-0.1.1-r337.tar.gz
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/setup.py
===================================================================
--- xin/setup.py (nonexistent)
+++ xin/setup.py (revision 338)
@@ -0,0 +1,60 @@
+#!/usr/bin/python
+
+from distutils.core import setup
+import py2exe
+import glob
+
+manifest = """
+
+
+Your Application
+
+
+
+
+
+"""
+
+"""
+installs manifest and icon into the .exe
+but icon is still needed as we open it
+for the window icon (not just the .exe)
+changelog and logo are included in dist
+"""
+
+setup(
+ options = {
+ "py2exe":{
+ #"dll_excludes": ["MSVCP90.dll", "HID.DLL", "w9xpopen.exe"],
+ "dll_excludes": ["MSVCP90.dll"],
+ }
+ },
+ windows = [
+ {
+ "script": "phr-gui.py",
+ "icon_resources": [(1, "grafica/phr-gui.ico")],
+ #"other_resources": [(24,1,manifest)]
+ }
+ ],
+ data_files=[
+ ("grafica", glob.glob('grafica/*.*')),
+ ("ejemplos", glob.glob('ejemplos/*.*')),
+ ("xc3sprog", glob.glob('xc3sprog/*.*')),
+ ("redist", glob.glob('redist/*.*')),
+ ]
+)
Index: xin/xc3sprog/lin
===================================================================
--- xin/xc3sprog/lin (nonexistent)
+++ xin/xc3sprog/lin (revision 338)
@@ -0,0 +1 @@
+link /home/maxi/Escritorio/xc3sprog
\ No newline at end of file
xin/xc3sprog/lin
Property changes :
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Index: xin/xc3sprog/win/javr.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/xc3sprog/win/javr.exe
===================================================================
--- xin/xc3sprog/win/javr.exe (nonexistent)
+++ xin/xc3sprog/win/javr.exe (revision 338)
xin/xc3sprog/win/javr.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/xc3sprog/win/jedecparse.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/xc3sprog/win/jedecparse.exe
===================================================================
--- xin/xc3sprog/win/jedecparse.exe (nonexistent)
+++ xin/xc3sprog/win/jedecparse.exe (revision 338)
xin/xc3sprog/win/jedecparse.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/xc3sprog/win/avrfuseparse.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/xc3sprog/win/avrfuseparse.exe
===================================================================
--- xin/xc3sprog/win/avrfuseparse.exe (nonexistent)
+++ xin/xc3sprog/win/avrfuseparse.exe (revision 338)
xin/xc3sprog/win/avrfuseparse.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/xc3sprog/win/srecparse.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/xc3sprog/win/srecparse.exe
===================================================================
--- xin/xc3sprog/win/srecparse.exe (nonexistent)
+++ xin/xc3sprog/win/srecparse.exe (revision 338)
xin/xc3sprog/win/srecparse.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/xc3sprog/win/xc3sprog.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/xc3sprog/win/xc3sprog.exe
===================================================================
--- xin/xc3sprog/win/xc3sprog.exe (nonexistent)
+++ xin/xc3sprog/win/xc3sprog.exe (revision 338)
xin/xc3sprog/win/xc3sprog.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/xc3sprog/win/xc2c_warp.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/xc3sprog/win/xc2c_warp.exe
===================================================================
--- xin/xc3sprog/win/xc2c_warp.exe (nonexistent)
+++ xin/xc3sprog/win/xc2c_warp.exe (revision 338)
xin/xc3sprog/win/xc2c_warp.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/xc3sprog/win/bitparse.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/xc3sprog/win/bitparse.exe
===================================================================
--- xin/xc3sprog/win/bitparse.exe (nonexistent)
+++ xin/xc3sprog/win/bitparse.exe (revision 338)
xin/xc3sprog/win/bitparse.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/xc3sprog/win/detectchain.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/xc3sprog/win/detectchain.exe
===================================================================
--- xin/xc3sprog/win/detectchain.exe (nonexistent)
+++ xin/xc3sprog/win/detectchain.exe (revision 338)
xin/xc3sprog/win/detectchain.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/xc3sprog/win/readdna.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/xc3sprog/win/readdna.exe
===================================================================
--- xin/xc3sprog/win/readdna.exe (nonexistent)
+++ xin/xc3sprog/win/readdna.exe (revision 338)
xin/xc3sprog/win/readdna.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/nis/phr-gui-011r337_instalar.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/nis/phr-gui-011r337_instalar.exe
===================================================================
--- xin/nis/phr-gui-011r337_instalar.exe (nonexistent)
+++ xin/nis/phr-gui-011r337_instalar.exe (revision 338)
xin/nis/phr-gui-011r337_instalar.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/nis/for_installer_r337.nsi
===================================================================
--- xin/nis/for_installer_r337.nsi (nonexistent)
+++ xin/nis/for_installer_r337.nsi (revision 338)
@@ -0,0 +1,168 @@
+; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "phrgui"
+!define PRODUCT_VERSION "0.1.1"
+!define PRODUCT_PUBLISHER "CUDAR (UTN-FRC)"
+!define PRODUCT_WEB_SITE "http://opencores.org/project,phr"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\phrgui.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
+!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN "$INSTDIR\phrgui.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "Spanish"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "phr-gui-011r337_instalar.exe"
+InstallDir "$PROGRAMFILES\phrgui"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Section "Principal" SEC01
+ SetOutPath "$INSTDIR"
+ SetOverwrite try
+ File "C:\Me\gui\xin03\dist\bz2.pyd"
+ File "C:\Me\gui\xin03\dist\fpgaFile"
+ SetOutPath "$INSTDIR\grafica"
+ File "C:\Me\gui\xin03\dist\grafica\phr-gui-96.png"
+ File "C:\Me\gui\xin03\dist\grafica\phr-gui.ico"
+ SetOutPath "$INSTDIR"
+ File "C:\Me\gui\xin03\dist\library.zip"
+ File "C:\Me\gui\xin03\dist\phrgui.exe"
+ CreateDirectory "$SMPROGRAMS\PHR GUI"
+ CreateShortCut "$SMPROGRAMS\PHR GUI\phrgui.lnk" "$INSTDIR\phrgui.exe"
+ CreateShortCut "$DESKTOP\phrgui.lnk" "$INSTDIR\phrgui.exe"
+ File "C:\Me\gui\xin03\dist\python27.dll"
+ SetOutPath "$INSTDIR\redist"
+ File "C:\Me\gui\xin03\dist\redist\vcredist_x86.exe"
+ SetOutPath "$INSTDIR"
+ File "C:\Me\gui\xin03\dist\select.pyd"
+ File "C:\Me\gui\xin03\dist\unicodedata.pyd"
+ File "C:\Me\gui\xin03\dist\w9xpopen.exe"
+ File "C:\Me\gui\xin03\dist\wx._controls_.pyd"
+ File "C:\Me\gui\xin03\dist\wx._core_.pyd"
+ File "C:\Me\gui\xin03\dist\wx._gdi_.pyd"
+ File "C:\Me\gui\xin03\dist\wx._misc_.pyd"
+ File "C:\Me\gui\xin03\dist\wx._windows_.pyd"
+ File "C:\Me\gui\xin03\dist\wxbase295u_net_vc90.dll"
+ File "C:\Me\gui\xin03\dist\wxbase295u_vc90.dll"
+ File "C:\Me\gui\xin03\dist\wxmsw295u_adv_vc90.dll"
+ File "C:\Me\gui\xin03\dist\wxmsw295u_core_vc90.dll"
+ File "C:\Me\gui\xin03\dist\wxmsw295u_html_vc90.dll"
+ SetOutPath "$INSTDIR\xc3sprog\win"
+ File "C:\Me\gui\xin03\dist\xc3sprog\win\avrfuseparse.exe"
+ File "C:\Me\gui\xin03\dist\xc3sprog\win\bitparse.exe"
+ File "C:\Me\gui\xin03\dist\xc3sprog\win\detectchain.exe"
+ File "C:\Me\gui\xin03\dist\xc3sprog\win\javr.exe"
+ File "C:\Me\gui\xin03\dist\xc3sprog\win\jedecparse.exe"
+ File "C:\Me\gui\xin03\dist\xc3sprog\win\readdna.exe"
+ File "C:\Me\gui\xin03\dist\xc3sprog\win\srecparse.exe"
+ File "C:\Me\gui\xin03\dist\xc3sprog\win\xc2c_warp.exe"
+ File "C:\Me\gui\xin03\dist\xc3sprog\win\xc3sprog.exe"
+ SetOutPath "$INSTDIR"
+ File "C:\Me\gui\xin03\dist\_hashlib.pyd"
+SectionEnd
+
+Section -AdditionalIcons
+ WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
+ CreateShortCut "$SMPROGRAMS\PHR GUI\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+ CreateShortCut "$SMPROGRAMS\PHR GUI\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+ ExecWait '$INSTDIR\redist\vcredist_x86.exe /q'
+ WriteUninstaller "$INSTDIR\uninst.exe"
+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\phrgui.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\phrgui.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+SectionEnd
+
+
+Function un.onUninstSuccess
+ HideWindow
+ MessageBox MB_ICONINFORMATION|MB_OK "La desinstalación de $(^Name) finalizó satisfactoriamente."
+FunctionEnd
+
+Function un.onInit
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "¿Está completamente seguro que desea desinstalar $(^Name) junto con todos sus componentes?" IDYES +2
+ Abort
+FunctionEnd
+
+Section Uninstall
+ Delete "$INSTDIR\${PRODUCT_NAME}.url"
+ Delete "$INSTDIR\uninst.exe"
+ Delete "$INSTDIR\_hashlib.pyd"
+ Delete "$INSTDIR\xc3sprog\win\xc3sprog.exe"
+ Delete "$INSTDIR\xc3sprog\win\xc2c_warp.exe"
+ Delete "$INSTDIR\xc3sprog\win\srecparse.exe"
+ Delete "$INSTDIR\xc3sprog\win\readdna.exe"
+ Delete "$INSTDIR\xc3sprog\win\jedecparse.exe"
+ Delete "$INSTDIR\xc3sprog\win\javr.exe"
+ Delete "$INSTDIR\xc3sprog\win\detectchain.exe"
+ Delete "$INSTDIR\xc3sprog\win\bitparse.exe"
+ Delete "$INSTDIR\xc3sprog\win\avrfuseparse.exe"
+ Delete "$INSTDIR\wxmsw295u_html_vc90.dll"
+ Delete "$INSTDIR\wxmsw295u_core_vc90.dll"
+ Delete "$INSTDIR\wxmsw295u_adv_vc90.dll"
+ Delete "$INSTDIR\wxbase295u_vc90.dll"
+ Delete "$INSTDIR\wxbase295u_net_vc90.dll"
+ Delete "$INSTDIR\wx._windows_.pyd"
+ Delete "$INSTDIR\wx._misc_.pyd"
+ Delete "$INSTDIR\wx._gdi_.pyd"
+ Delete "$INSTDIR\wx._core_.pyd"
+ Delete "$INSTDIR\wx._controls_.pyd"
+ Delete "$INSTDIR\w9xpopen.exe"
+ Delete "$INSTDIR\unicodedata.pyd"
+ Delete "$INSTDIR\select.pyd"
+ Delete "$INSTDIR\redist\vcredist_x86.exe"
+ Delete "$INSTDIR\python27.dll"
+ Delete "$INSTDIR\phrgui.exe"
+ Delete "$INSTDIR\library.zip"
+ Delete "$INSTDIR\grafica\phr-gui.ico"
+ Delete "$INSTDIR\grafica\phr-gui-96.png"
+ Delete "$INSTDIR\fpgaFile"
+ Delete "$INSTDIR\bz2.pyd"
+
+ Delete "$SMPROGRAMS\PHR GUI\Uninstall.lnk"
+ Delete "$SMPROGRAMS\PHR GUI\Website.lnk"
+ Delete "$DESKTOP\phrgui.lnk"
+ Delete "$SMPROGRAMS\PHR GUI\phrgui.lnk"
+
+ RMDir "$SMPROGRAMS\PHR GUI"
+ RMDir "$INSTDIR\xc3sprog\win"
+ RMDir "$INSTDIR\redist"
+ RMDir "$INSTDIR\grafica"
+ RMDir "$INSTDIR"
+
+ DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+ DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+ SetAutoClose true
+SectionEnd
\ No newline at end of file
Index: xin/nis/readme.txt
===================================================================
--- xin/nis/readme.txt (nonexistent)
+++ xin/nis/readme.txt (revision 338)
@@ -0,0 +1,6 @@
+En la seccion Section -Post
+
+agregar:
+ ExecWait '$INSTDIR\redist\vcredist_x86.exe /q'
+
+para instalar las librerias extras
\ No newline at end of file
Index: xin/redist/vcredist_x86.exe
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: xin/redist/vcredist_x86.exe
===================================================================
--- xin/redist/vcredist_x86.exe (nonexistent)
+++ xin/redist/vcredist_x86.exe (revision 338)
xin/redist/vcredist_x86.exe
Property changes :
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: xin/readme.txt
===================================================================
--- xin/readme.txt (nonexistent)
+++ xin/readme.txt (revision 338)
@@ -0,0 +1,5 @@
+para compilar ejecutar desde cmd:
+
+python setup.py py2exe
+
+esto crea el directorio de dist para distribucion
\ No newline at end of file