← Back to branch summary

~fva-openerp/openerp-tools/trunk

« back to all changes in this revision

Viewing changes to packaging61/windows/setup.nsi

  • Committer: Vo Minh Thu
  • Date: 2011-12-20 09:40:13 UTC
  • Revision ID: vmt@openerp.com-20111220094013-9gigy9xs68qv26qs
[FIX] packaging61: fixed two previous commits.

Show diffs side-by-side

added added

removed removed

Lines of Context:
packaging61/windows/setup.nsi
74
74
!ifndef REVISION_VERSION
75
75
    !define REVISION_VERSION '0'
76
76
!endif
77
 
!ifndef BUILD_VERSION
 
77
 
 
78
!ifndef VERSION
78
79
    !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}-r${REVISION_VERSION}"
79
 
!else
80
 
    !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}-${BUILD_VERSION}-r${REVISION_VERSION}"
81
80
!endif
 
81
 
82
82
!define PRODUCT_NAME "OpenERP"
83
83
!define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}.${MINOR_VERSION}"
84
84